Diff: Game.h

Revision:

15:d5eb13c4c1c6

Parent:

14:b4fed570abaf

Child:

16:caf613d5b85e

diff -r b4fed570abaf -r d5eb13c4c1c6 Game.h
--- a/Game.h	Sat May 09 14:39:48 2015 +0000
+++ b/Game.h	Sun May 10 09:37:51 2015 +0000
@@ -21,6 +21,14 @@
     int vx, vy;
 };
 
+struct Rectangle
+{
+    Rectangle(int x, int y, int w, int h) : x(x), y(y), width(w), height(h) {}
+    int x;
+    int y;
+    int width;
+    int height;
+};
 /// State: Game
 class Game : public State
 {
@@ -39,12 +47,17 @@
     private:
         /// Moves entity in map. If collision occurs, entity can not move further
         void moveWithCollisionTest(Entity* entity, const int map[HEIGHT][WIDTH]);
+        bool hitTestRect(Rectangle r1, Rectangle r2); /// Returns true if two rectangles overlap
+        bool bulletHitMap(Rectangle &bulletColRect, const int map[HEIGHT][WIDTH]); /// Help function for detecting collision between moving bullet and map.
     
         void init();    /// Sets some initial values
         Entity player;  /// Player object
-        Entity enemy;   /// Enemy object
+        Enemy *enemy;   /// Enemy object
         
         bool releasedBtnB;  /// True if button B has been released after being pressed down
+        bool releasedBtnC;
+        bool paused;        // True if the game is paused
+        
         
         std::vector<Point*> bullets;    /// Container for bullets
 };