* Remove "speed" parameter from Bomberman::move_to_direction() to match implementation.

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

diff --git a/ABM2/Playground.h b/ABM2/Playground.h
index 1c99ab4030b095164f1e8a079a20255c783e1ca2..541bf2af566c1ca3bf512a060c65bb6f9d82ebd4 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
@@ -34,18 +34,24 @@ public:
        int getFieldCenterY();\r
 private:\r
        int x,y;\r
+#ifdef WIN32\r
        LPDIRECT3DTEXTURE9 texture;\r
+#endif // WIN32\r
 };\r
 \r
 class Item\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
        void Draw();\r
        int col, row, tex_num, subitem_height, subitem_width;\r
 private:\r
+#ifdef WIN32\r
        LPDIRECT3DTEXTURE9 texture;\r
+#endif // WIN32\r
 };\r
 \r
 class Playground : public ITask\r
@@ -56,8 +62,10 @@ public:
        void Stop();\r
        AUTO_SIZE;\r
 private:\r
+#ifdef WIN32\r
        LPDIRECT3DTEXTURE9 background;\r
        LPDIRECT3DTEXTURE9 foreground;\r
+#endif // WIN32\r
 \r
        Bomberman *bomberman;\r
        Item *field[PLAYGROUND_COLS][PLAYGROUND_ROWS];\r