* Move SpriteID enum to engine.h.

[matthijs/ABM2.git] / ABM2 / Engine / engine.h

diff --git a/ABM2/Engine/engine.h b/ABM2/Engine/engine.h
index 9fe5375978acdeb6372712808d668455feaeaa3a..78a7e8be49c9e9b8279b06bb4f1d3dad5465ded9 100755 (executable)
--- a/ABM2/Engine/engine.h
+++ b/ABM2/Engine/engine.h
@@ -3,7 +3,6 @@
 \r
 #pragma warning ( disable : 4786 )\r
 \r
-\r
 #include <iostream>\r
 #include <ostream>\r
 #include <istream>\r
@@ -24,6 +23,7 @@
 #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
@@ -37,25 +37,35 @@
 #include <fmod.h>\r
 */\r
 //foundation layer headers\r
-#include "log.h"\r
+#include "Log.h"\r
 #include "mmanager.h"\r
 #include "singleton.h"\r
 #include "functor.h"\r
 #include "dator.h"\r
-#include "kernel.h"\r
-#include "settings.h"\r
+#include "Kernel.h"\r
+#include "Settings.h"\r
 #include "profiler.h"\r
-#include "profileloghandler.h"\r
+#include "ProfileLogHandler.h"\r
 \r
 \r
 //task pool\r
-#include "videoupdate.h"\r
-#include "globalTimer.h"\r
-#include "inputtask.h"\r
-#include "soundtask.h"\r
+#include "VideoUpdate.h"\r
+#include "GlobalTimer.h"\r
+#include "InputTask.h"\r
+#include "SoundTask.h"\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_SOLID,\r
+       SPR_BRICK,\r
+       SPR_BLANK,\r
+       SPR_PLAYER,\r
+};\r
+\r
+#endif\r