X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;ds=sidebyside;f=ABM2%2FPlayground.h;h=99896744af2675deb649af4f06644b6cdc340999;hb=refs%2Fheads%2Flinux;hp=bed17cccd2a23abd3f565e2b816a82d5a174ce56;hpb=357a451150c18b27f99cecd5f9d13be1ae5a9fdf;p=matthijs%2FABM2.git

diff --git a/ABM2/Playground.h b/ABM2/Playground.h
index bed17cc..9989674 100755
--- a/ABM2/Playground.h
+++ b/ABM2/Playground.h
@@ -16,12 +16,12 @@ enum TMoveDirection { N,NNE,NE,NEE,E,SEE,SE,SSE,S,SSW,SW,SWW,W,NWW,NW,NNW }; //(
 class Bomberman
 {
 public:
-	Bomberman(int xloc, int yloc);
+	Bomberman(const CMMPointer<Sprite> &sprite, int xloc, int yloc);
 	~Bomberman();
 	void Update();
 	void move(int xloc, int yloc);
 	void move_to(int xloc, int yloc);
-	void move_to_direction(TMoveDirection dir, int speed);
+	void move_to_direction(TMoveDirection dir);
 	int getY();
 	int getX();
 	int getHeight();
@@ -33,41 +33,33 @@ public:
 	int getFieldCenterX();
 	int getFieldCenterY();
 private:
-#ifdef WIN32
 	int x,y;
-	LPDIRECT3DTEXTURE9 texture;
-#endif // WIN32
+	CMMPointer<Sprite> sprite;
 };
 
-class Item
+class Tile
 {
 public:
-#ifdef WIN32
-	Item(LPDIRECT3DTEXTURE9 t, int texnr, int subwidth, int subheight, int colnr, int rownr);
-#endif // WIN32
-	~Item();
+	Tile(const CMMPointer<Sprite> &sprite, int subsprite, int col, int row);
+	~Tile();
 	void Draw();
-	int col, row, tex_num, subitem_height, subitem_width;
 private:
-#ifdef WIN32
-	LPDIRECT3DTEXTURE9 texture;
-#endif // WIN32
+	CMMPointer<Sprite> sprite;
+	int col, row, subsprite;
 };
 
 class Playground : public ITask
 {
 public:
+	Playground(CKernel *kernel);
 	bool Start();
 	void Update();
 	void Stop();
 	AUTO_SIZE;
 private:
-#ifdef WIN32
-	LPDIRECT3DTEXTURE9 background;
-	LPDIRECT3DTEXTURE9 foreground;
 
 	Bomberman *bomberman;
-	Item *field[PLAYGROUND_COLS][PLAYGROUND_ROWS];
+	Tile *field[PLAYGROUND_COLS][PLAYGROUND_ROWS];
 
 	void move_up();
 	void move_down();
@@ -75,5 +67,4 @@ private:
 	void move_left();
 
 	DWORD old_counter;
-#endif // WIN32
 };