projects
/
matthijs
/
ABM2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Make every ITask know about the Kernel in which the run.
[matthijs/ABM2.git]
/
ABM2
/
Playground.h
diff --git
a/ABM2/Playground.h
b/ABM2/Playground.h
index bed17cccd2a23abd3f565e2b816a82d5a174ce56..20d10522c07eee8628b45c322b86460ac338aa7f 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 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
int getY();
\r
int getX();
\r
int getHeight();
\r
@@
-33,8
+33,8
@@
public:
int getFieldCenterX();
\r
int getFieldCenterY();
\r
private:
\r
int getFieldCenterX();
\r
int getFieldCenterY();
\r
private:
\r
-#ifdef WIN32
\r
int x,y;
\r
int x,y;
\r
+#ifdef WIN32
\r
LPDIRECT3DTEXTURE9 texture;
\r
#endif // WIN32
\r
};
\r
LPDIRECT3DTEXTURE9 texture;
\r
#endif // WIN32
\r
};
\r
@@
-57,6
+57,7
@@
private:
class Playground : public ITask
\r
{
\r
public:
\r
class Playground : public ITask
\r
{
\r
public:
\r
+ Playground(CKernel *kernel);
\r
bool Start();
\r
void Update();
\r
void Stop();
\r
bool Start();
\r
void Update();
\r
void Stop();
\r
@@
-65,6
+66,7
@@
private:
#ifdef WIN32
\r
LPDIRECT3DTEXTURE9 background;
\r
LPDIRECT3DTEXTURE9 foreground;
\r
#ifdef WIN32
\r
LPDIRECT3DTEXTURE9 background;
\r
LPDIRECT3DTEXTURE9 foreground;
\r
+#endif // WIN32
\r
\r
Bomberman *bomberman;
\r
Item *field[PLAYGROUND_COLS][PLAYGROUND_ROWS];
\r
\r
Bomberman *bomberman;
\r
Item *field[PLAYGROUND_COLS][PLAYGROUND_ROWS];
\r
@@
-75,5
+77,4
@@
private:
void move_left();
\r
\r
DWORD old_counter;
\r
void move_left();
\r
\r
DWORD old_counter;
\r
-#endif // WIN32
\r
};
\r
};
\r