projects
/
matthijs
/
ABM2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Add Tile0 sprite.
[matthijs/ABM2.git]
/
ABM2
/
main.cpp
diff --git
a/ABM2/main.cpp
b/ABM2/main.cpp
index e325647b86402a4ca002bcbea96218abba118c16..210382e119bf86f02aeceb9219f0a31240361bbb 100755
(executable)
--- a/
ABM2/main.cpp
+++ b/
ABM2/main.cpp
@@
-14,18
+14,9
@@
#define SCREEN_WIDTH 640
\r
#define SCREEN_HEIGHT 480
\r
\r
#define SCREEN_WIDTH 640
\r
#define SCREEN_HEIGHT 480
\r
\r
-enum SpriteID {
\r
- SPR_NONE = 0,
\r
- SPR_FIELD,
\r
- SPR_SOLID,
\r
- SPR_BRICK,
\r
- SPR_BLANK,
\r
- SPR_PLAYER,
\r
-};
\r
-
\r
SpriteData defaultSprites[] = {
\r
SpriteData defaultSprites[] = {
\r
- {SPR_FIELD, "FIELD0.png", 640, 480},
\r
- {SPR_
BLANK, "FIELD0.png", 640, 480
},
\r
+ {SPR_FIELD, "
Data/
FIELD0.png", 640, 480},
\r
+ {SPR_
TILE, "Data/Tiles0.png", 40, 36
},
\r
{SPR_NONE, NULL, 0, 0}
\r
};
\r
\r
{SPR_NONE, NULL, 0, 0}
\r
};
\r
\r
@@
-174,10
+165,11
@@
void CApplication::Run(int argc, char *argv[])
CSpriteManager *sm = new CSpriteManager(videoTask->getGraphics(), defaultSprites);
\r
CKernel::GetSingleton().setSpriteManager(sm);
\r
\r
CSpriteManager *sm = new CSpriteManager(videoTask->getGraphics(), defaultSprites);
\r
CKernel::GetSingleton().setSpriteManager(sm);
\r
\r
- Playground game;
\r
+ Playground game
(&CKernel::GetSingleton())
;
\r
game.priority=100;
\r
CKernel::GetSingleton().AddTask(CMMPointer<ITask>(&game));
\r
\r
game.priority=100;
\r
CKernel::GetSingleton().AddTask(CMMPointer<ITask>(&game));
\r
\r
+
\r
//set up the profiler with an output handler
\r
CProfileLogHandler profileLogHandler;
\r
CProfileSample::outputHandler=&profileLogHandler;
\r
//set up the profiler with an output handler
\r
CProfileLogHandler profileLogHandler;
\r
CProfileSample::outputHandler=&profileLogHandler;
\r