projects
/
matthijs
/
ABM2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Make CEngine keep a CSpriteManager.
[matthijs/ABM2.git]
/
ABM2
/
Engine
/
Kernel.h
diff --git
a/ABM2/Engine/Kernel.h
b/ABM2/Engine/Kernel.h
index 0e1c39d8a584fe9e4959925de89854aa97f4c9e9..3eda3db6a5c011a9915e9d8b95c6a6865736ef9b 100755
(executable)
--- a/
ABM2/Engine/Kernel.h
+++ b/
ABM2/Engine/Kernel.h
@@
-10,6
+10,7
@@
#endif // _MSC_VER > 1000
\r
\r
#include "singleton.h"
\r
#endif // _MSC_VER > 1000
\r
\r
#include "singleton.h"
\r
+#include "SpriteManager.h"
\r
\r
\r
class CClient;
\r
\r
\r
class CClient;
\r
@@
-30,10
+31,13
@@
public:
void ResumeTask(const CMMPointer<ITask> &t);
\r
void RemoveTask(const CMMPointer<ITask> &t);
\r
void KillAllTasks();
\r
void ResumeTask(const CMMPointer<ITask> &t);
\r
void RemoveTask(const CMMPointer<ITask> &t);
\r
void KillAllTasks();
\r
-
\r
+
\r
+ void setSpriteManager(CSpriteManager*) {this->sm = sm;}
\r
+ CSpriteManager* getSpriteManager() {return this->sm;}
\r
protected:
\r
std::list< CMMPointer<ITask> > taskList;
\r
std::list< CMMPointer<ITask> > pausedTaskList;
\r
protected:
\r
std::list< CMMPointer<ITask> > taskList;
\r
std::list< CMMPointer<ITask> > pausedTaskList;
\r
+ CSpriteManager *sm;
\r
};
\r
\r
class ITask : public IMMObject
\r
};
\r
\r
class ITask : public IMMObject
\r