Diff: Frogger/Frogger.h

Revision:

37:65c9e5a65738

Parent:

29:2151cd327a36

Child:

42:04e326dcf09b

diff -r 56c1b33f49ce -r 65c9e5a65738 Frogger/Frogger.h
--- a/Frogger/Frogger.h	Sun May 17 22:38:20 2020 +0000
+++ b/Frogger/Frogger.h	Sun May 17 23:20:23 2020 +0000
@@ -7,7 +7,6 @@
 #include "Frog.h"
 #include "WaterObject.h"
 #include "Level.h"
-#include "Vehicle.h"
 
 #include <vector>
 
@@ -31,17 +30,23 @@
     public: 
         
         GraphicEngine *graphics; // local renderer object
-        Level *level; // local level object
+        Level *levelptr; // local level object
         Frog *frog;
-        CrossyChicken(GraphicEngine *engine, Level *level, Frog *frog); // constructor
+        int grid; // size of one game unit
+       
+
+        Frogger(GraphicEngine *engine, Level *levelptr, Frog *frog, int grid, int w, int h); // constructor
+        
+    public:
+        int current_level;
         
     public:
     
         Gamepad gamepad;
         int row_number;
         int grid_width; // screen width in grid units
-        int screenW;
-        int screenH;
+        int lcd_w;
+        int lcd_h;
         
         std::vector<Background> roads;
         std::vector<Safety> safety_lane;
@@ -65,9 +70,7 @@
         void setup();
         void setCollision(Car* object);
         void frogOnLog(Car* car);
-        bool returnCollision(Car* log);
-         
-    private:
+        bool returnCollision(Car* log);       
 };