projects
/
matthijs
/
ABM2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Don't sleep for negative amounts (overflows to very large sleep delays :-)
[matthijs/ABM2.git]
/
ABM2
/
Playground.cpp
diff --git
a/ABM2/Playground.cpp
b/ABM2/Playground.cpp
index a115d520a757d77ccd4b8b5692693db1c6ba4be3..c1876418a4713d0203b61a96359092fe0df83a56 100755
(executable)
--- a/
ABM2/Playground.cpp
+++ b/
ABM2/Playground.cpp
@@
-1,5
+1,6
@@
#include "Playground.h"
\r
\r
#include "Playground.h"
\r
\r
+#include "Engine/engine.h"
\r
#include "Engine/VideoUpdate.h"
\r
#include "SchemeReader.h"
\r
\r
#include "Engine/VideoUpdate.h"
\r
#include "SchemeReader.h"
\r
\r
@@
-8,6
+9,11
@@
LPD3DXSPRITE d3dspt;
LPD3DXFONT font;
\r
\r
#endif
\r
LPD3DXFONT font;
\r
\r
#endif
\r
+
\r
+Playground::Playground(CKernel* kernel) {
\r
+ this->kernel = kernel;
\r
+}
\r
+
\r
bool Playground::Start()
\r
{
\r
#if WIN32
\r
bool Playground::Start()
\r
{
\r
#if WIN32
\r
@@
-66,7
+72,7
@@
bool Playground::Start()
\r
#endif
\r
// init playing field
\r
\r
#endif
\r
// init playing field
\r
- SchemeReader *scheme = new SchemeReader("
d
ata/schemes/BASIC.SCH");
\r
+ SchemeReader *scheme = new SchemeReader("
D
ata/schemes/BASIC.SCH");
\r
for (int i=0; i<PLAYGROUND_COLS; ++i)
\r
{
\r
for (int j=0; j<PLAYGROUND_ROWS; ++j)
\r
for (int i=0; i<PLAYGROUND_COLS; ++i)
\r
{
\r
for (int j=0; j<PLAYGROUND_ROWS; ++j)
\r
@@
-115,13
+121,15
@@
bool Playground::Start()
field[0][1] = NULL;
\r
}
\r
\r
field[0][1] = NULL;
\r
}
\r
\r
-
\r
old_counter = GetTickCount();
\r
return true;
\r
}
\r
\r
void Playground::Update()
\r
{
\r
old_counter = GetTickCount();
\r
return true;
\r
}
\r
\r
void Playground::Update()
\r
{
\r
+ CMMPointer<Sprite> s = this->kernel->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
if(CInputTask::keyDown(DIK_ESCAPE))CKernel::GetSingleton().KillAllTasks();
\r
\r
#ifdef WIN32
\r
if(CInputTask::keyDown(DIK_ESCAPE))CKernel::GetSingleton().KillAllTasks();
\r
\r