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 48dcd73f664a1692542a03fd47e7b3546c122ccc..210382e119bf86f02aeceb9219f0a31240361bbb 100755
(executable)
--- a/
ABM2/main.cpp
+++ b/
ABM2/main.cpp
@@
-6,6
+6,7
@@
\r
#include "Engine/engine.h"
\r
#include "Engine/game.h"
\r
\r
#include "Engine/engine.h"
\r
#include "Engine/game.h"
\r
+#include "Engine/SpriteManager.h"
\r
#include "Playground.h"
\r
#include "SchemeReader.h"
\r
\r
#include "Playground.h"
\r
#include "SchemeReader.h"
\r
\r
@@
-13,6
+14,12
@@
#define SCREEN_WIDTH 640
\r
#define SCREEN_HEIGHT 480
\r
\r
#define SCREEN_WIDTH 640
\r
#define SCREEN_HEIGHT 480
\r
\r
+SpriteData defaultSprites[] = {
\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
#ifdef WIN32
\r
HINSTANCE hInstance;
\r
HWND hWnd;
\r
#ifdef WIN32
\r
HINSTANCE hInstance;
\r
HWND hWnd;
\r
@@
-155,10
+162,14
@@
void CApplication::Run(int argc, char *argv[])
globalTimer->priority=10;
\r
CKernel::GetSingleton().AddTask(CMMPointer<ITask>(globalTimer));
\r
\r
globalTimer->priority=10;
\r
CKernel::GetSingleton().AddTask(CMMPointer<ITask>(globalTimer));
\r
\r
- Playground game;
\r
+ CSpriteManager *sm = new CSpriteManager(videoTask->getGraphics(), defaultSprites);
\r
+ CKernel::GetSingleton().setSpriteManager(sm);
\r
+
\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