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.cpp
diff --git
a/ABM2/Playground.cpp
b/ABM2/Playground.cpp
index c1876418a4713d0203b61a96359092fe0df83a56..41c8b4b55fd81e407adec9a2e3202dc2f2fbdb0d 100755
(executable)
--- a/
ABM2/Playground.cpp
+++ b/
ABM2/Playground.cpp
@@
-10,9
+10,7
@@
LPD3DXFONT font;
\r
#endif
\r
\r
\r
#endif
\r
\r
-Playground::Playground(CKernel* kernel) {
\r
- this->kernel = kernel;
\r
-}
\r
+Playground::Playground(CKernel* kernel) : ITask(kernel) { }
\r
\r
bool Playground::Start()
\r
{
\r
\r
bool Playground::Start()
\r
{
\r
@@
-127,7
+125,7
@@
bool Playground::Start()
\r
void Playground::Update()
\r
{
\r
\r
void Playground::Update()
\r
{
\r
- CMMPointer<Sprite> s = this->
kernel
->getSpriteManager()->getSprite(SPR_FIELD);
\r
+ CMMPointer<Sprite> s = this->
getKernel()
->getSpriteManager()->getSprite(SPR_FIELD);
\r
\r
s->blit(0, 0, 1.0, 1.0, 0, 0, COLOUR_RGBA(0, 0, 255, 255));
\r
#ifdef WIN32
\r
\r
s->blit(0, 0, 1.0, 1.0, 0, 0, COLOUR_RGBA(0, 0, 255, 255));
\r
#ifdef WIN32
\r