Follow changes in wxRenderer interface.

[wxWidgets.git] / demos / bombs / game.h

diff --git a/demos/bombs/game.h b/demos/bombs/game.h
index 00cc83ea058687d7b484a92a8974a7efe030fd4b..fc500ecd94bc21b62d9f960091d2e8bb292167bd 100644 (file)
--- a/demos/bombs/game.h
+++ b/demos/bombs/game.h
@@ -2,7 +2,7 @@
 // Name:        game.h
 // Purpose:     Bombs game
 // Author:      P. Foggia 1996
 // Name:        game.h
 // Purpose:     Bombs game
 // Author:      P. Foggia 1996

-// Modified by: Wlodzimierz Skiba (ABX) 2003
+// Modified by: Wlodzimierz Skiba (ABX) since 2003

 // Created:     1996
 // RCS-ID:      $Id$
 // Copyright:   (c) 1996 P. Foggia
 // Created:     1996
 // RCS-ID:      $Id$
 // Copyright:   (c) 1996 P. Foggia


@@ -16,7 +16,8 @@
 #define BG_BOMB     0x200
 #define BG_MARKED   0x400
 #define BG_EXPLODED 0x800
 #define BG_BOMB     0x200
 #define BG_MARKED   0x400
 #define BG_EXPLODED 0x800

-#define BG_MASK     0x0FF
+#define BG_SELECTED 0x080
+#define BG_MASK     0x03F

 
 #include <stddef.h>
 
 
 #include <stddef.h>
 


@@ -64,6 +65,11 @@ public:
         return Get(x,y) & BG_EXPLODED;
     };
 
         return Get(x,y) & BG_EXPLODED;
     };
 

+    int IsSelected(int x, int y) const
+    {
+        return Get(x,y) & BG_SELECTED;
+    };
+

     int GetNumBombs() const
     {
         return m_numBombCells;
     int GetNumBombs() const
     {
         return m_numBombCells;


@@ -74,16 +80,20 @@ public:
         return m_numRemainingCells;
     };
 
         return m_numRemainingCells;
     };
 

+    int GetNumMarkedCells() const
+    {
+        return m_numMarkedCells;
+    };

 
 
 
 

-    bool Init(int width, int height);
+    bool Init(int width, int height, bool easyCorner = false);

 
 
     // Marks/unmarks a cell
     void Mark(int x, int y);
 
     // Unhides a cell
 
 
     // Marks/unmarks a cell
     void Mark(int x, int y);
 
     // Unhides a cell

-    void Unhide(int x, int y);
+    void Unhide(int x, int y, bool b_selected);

 
     // Makes a cell exploded
     void Explode(int x, int y);
 
     // Makes a cell exploded
     void Explode(int x, int y);


@@ -98,7 +108,7 @@ private:
 
     int m_width, m_height;
     short *m_field;
 
     int m_width, m_height;
     short *m_field;

-    int m_numBombCells, m_numRemainingCells;
+    int m_numBombCells, m_numRemainingCells, m_numMarkedCells;

 
 };
 
 
 };