* Remove most unused WIN32 stuff.

[matthijs/ABM2.git] / ABM2 / Playground.h

diff --git a/ABM2/Playground.h b/ABM2/Playground.h
index bed17cccd2a23abd3f565e2b816a82d5a174ce56..879b4b005b7241050d3973950882bbf2d6168f84 100755 (executable)
--- a/ABM2/Playground.h
+++ b/ABM2/Playground.h
@@ -21,7 +21,7 @@ public:
        void Update();\r
        void move(int xloc, int yloc);\r
        void move_to(int xloc, int yloc);\r
-       void move_to_direction(TMoveDirection dir, int speed);\r
+       void move_to_direction(TMoveDirection dir);\r
        int getY();\r
        int getX();\r
        int getHeight();\r
@@ -33,41 +33,35 @@ public:
        int getFieldCenterX();\r
        int getFieldCenterY();\r
 private:\r
-#ifdef WIN32\r
        int x,y;\r
+#ifdef WIN32\r
        LPDIRECT3DTEXTURE9 texture;\r
 #endif // WIN32\r
 };\r
 \r
-class Item\r
+class Tile\r
 {\r
 public:\r
-#ifdef WIN32\r
-       Item(LPDIRECT3DTEXTURE9 t, int texnr, int subwidth, int subheight, int colnr, int rownr);\r
-#endif // WIN32\r
-       ~Item();\r
+       Tile(const CMMPointer<Sprite> &sprite, int subsprite, int col, int row);\r
+       ~Tile();\r
        void Draw();\r
-       int col, row, tex_num, subitem_height, subitem_width;\r
 private:\r
-#ifdef WIN32\r
-       LPDIRECT3DTEXTURE9 texture;\r
-#endif // WIN32\r
+       CMMPointer<Sprite> sprite;\r
+       int col, row, subsprite;\r
 };\r
 \r
 class Playground : public ITask\r
 {\r
 public:\r
+       Playground(CKernel *kernel);\r
        bool Start();\r
        void Update();\r
        void Stop();\r
        AUTO_SIZE;\r
 private:\r
-#ifdef WIN32\r
-       LPDIRECT3DTEXTURE9 background;\r
-       LPDIRECT3DTEXTURE9 foreground;\r
 \r
        Bomberman *bomberman;\r
-       Item *field[PLAYGROUND_COLS][PLAYGROUND_ROWS];\r
+       Tile *field[PLAYGROUND_COLS][PLAYGROUND_ROWS];\r
 \r
        void move_up();\r
        void move_down();\r
@@ -75,5 +69,4 @@ private:
        void move_left();\r
 \r
        DWORD old_counter;\r
-#endif // WIN32\r
 };\r