projects
/
matthijs
/
ABM2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Increase the maximum FPS again to 20 FPS.
[matthijs/ABM2.git]
/
ABM2
/
Playground.h
diff --git
a/ABM2/Playground.h
b/ABM2/Playground.h
index 20d10522c07eee8628b45c322b86460ac338aa7f..99896744af2675deb649af4f06644b6cdc340999 100755
(executable)
--- a/
ABM2/Playground.h
+++ b/
ABM2/Playground.h
@@
-16,7
+16,7
@@
enum TMoveDirection { N,NNE,NE,NEE,E,SEE,SE,SSE,S,SSW,SW,SWW,W,NWW,NW,NNW }; //(
class Bomberman
\r
{
\r
public:
\r
class Bomberman
\r
{
\r
public:
\r
- Bomberman(int xloc, int yloc);
\r
+ Bomberman(
const CMMPointer<Sprite> &sprite,
int xloc, int yloc);
\r
~Bomberman();
\r
void Update();
\r
void move(int xloc, int yloc);
\r
~Bomberman();
\r
void Update();
\r
void move(int xloc, int yloc);
\r
@@
-34,24
+34,18
@@
public:
int getFieldCenterY();
\r
private:
\r
int x,y;
\r
int getFieldCenterY();
\r
private:
\r
int x,y;
\r
-#ifdef WIN32
\r
- LPDIRECT3DTEXTURE9 texture;
\r
-#endif // WIN32
\r
+ CMMPointer<Sprite> sprite;
\r
};
\r
\r
};
\r
\r
-class
Item
\r
+class
Tile
\r
{
\r
public:
\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
void Draw();
\r
- int col, row, tex_num, subitem_height, subitem_width;
\r
private:
\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
\r
class Playground : public ITask
\r
@@
-63,13
+57,9
@@
public:
void Stop();
\r
AUTO_SIZE;
\r
private:
\r
void Stop();
\r
AUTO_SIZE;
\r
private:
\r
-#ifdef WIN32
\r
- LPDIRECT3DTEXTURE9 background;
\r
- LPDIRECT3DTEXTURE9 foreground;
\r
-#endif // WIN32
\r
\r
Bomberman *bomberman;
\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
\r
void move_up();
\r
void move_down();
\r