projects
/
matthijs
/
ABM2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Make the InputTask quit the program on escape.
[matthijs/ABM2.git]
/
ABM2
/
Engine
/
engine.h
diff --git
a/ABM2/Engine/engine.h
b/ABM2/Engine/engine.h
index 9fe5375978acdeb6372712808d668455feaeaa3a..79660d20c51f99fd5cffc385599bb818a7bbd418 100755
(executable)
--- a/
ABM2/Engine/engine.h
+++ b/
ABM2/Engine/engine.h
@@
-3,7
+3,6
@@
\r
#pragma warning ( disable : 4786 )
\r
\r
\r
#pragma warning ( disable : 4786 )
\r
\r
-
\r
#include <iostream>
\r
#include <ostream>
\r
#include <istream>
\r
#include <iostream>
\r
#include <ostream>
\r
#include <istream>
\r
@@
-21,9
+20,7
@@
#include <cmath>
\r
#include <ctime>
\r
\r
#include <cmath>
\r
#include <ctime>
\r
\r
-#ifdef WIN32
\r
-#include <windows.h>
\r
-#endif
\r
+#include "porting.h"
\r
\r
//even though resource.h is technically a Win32-resource file, it's just a bunch of defines, so it's ok (and necessary)
\r
#include "resource.h"
\r
\r
//even though resource.h is technically a Win32-resource file, it's just a bunch of defines, so it's ok (and necessary)
\r
#include "resource.h"
\r
@@
-37,25
+34,39
@@
#include <fmod.h>
\r
*/
\r
//foundation layer headers
\r
#include <fmod.h>
\r
*/
\r
//foundation layer headers
\r
-#include "
l
og.h"
\r
+#include "
L
og.h"
\r
#include "mmanager.h"
\r
#include "singleton.h"
\r
#include "functor.h"
\r
#include "dator.h"
\r
#include "mmanager.h"
\r
#include "singleton.h"
\r
#include "functor.h"
\r
#include "dator.h"
\r
-#include "
k
ernel.h"
\r
-#include "
s
ettings.h"
\r
+#include "
K
ernel.h"
\r
+#include "
S
ettings.h"
\r
#include "profiler.h"
\r
#include "profiler.h"
\r
-#include "
profilelogh
andler.h"
\r
+#include "
ProfileLogH
andler.h"
\r
\r
\r
//task pool
\r
\r
\r
//task pool
\r
-#include "
videou
pdate.h"
\r
-#include "
g
lobalTimer.h"
\r
-#include "
inputt
ask.h"
\r
-#include "
soundt
ask.h"
\r
+#include "
VideoU
pdate.h"
\r
+#include "
G
lobalTimer.h"
\r
+#include "
InputT
ask.h"
\r
+#include "
SoundT
ask.h"
\r
\r
//misc
\r
#include "misc.h"
\r
#include "math.h"
\r
\r
\r
//misc
\r
#include "misc.h"
\r
#include "math.h"
\r
\r
-#endif
\ No newline at end of file
+/** Where should this be? */
\r
+enum SpriteID {
\r
+ SPR_NONE = 0,
\r
+ SPR_FIELD,
\r
+ SPR_TILE,
\r
+ SPR_PLAYER,
\r
+};
\r
+
\r
+enum {
\r
+ SPR_SUB_BRICK = 0,
\r
+ SPR_SUB_SOLID = 1,
\r
+ SPR_SUB_CLEAR = 2,
\r
+};
\r
+
\r
+#endif
\r