* Remove some hacks.

 * Move GetTickCount hack to profiler.h

diff --git a/ABM2/Engine/profiler.h b/ABM2/Engine/profiler.h
index 77eee052e6c452774d5421f3470f988c8cb034a9..5a5ad32991c8fa18c5af37b3b2b3d0c7610629d7 100755 (executable)
--- a/ABM2/Engine/profiler.h
+++ b/ABM2/Engine/profiler.h
@@ -3,6 +3,9 @@
 \r
 #define MAX_PROFILER_SAMPLES 50\r
 \r
+/* HACK to make things compile */\r
+#define GetTickCount() 0\r
+\r
 class IProfilerOutputHandler;\r
 class CProfileSample;\r
 \r

diff --git a/ABM2/main.cpp b/ABM2/main.cpp
index 7348a15fa1545965c41d68edc2beb71bdea65c6d..48dcd73f664a1692542a03fd47e7b3546c122ccc 100755 (executable)
--- a/ABM2/main.cpp
+++ b/ABM2/main.cpp
@@ -4,13 +4,6 @@
 #include <windowsx.h>\r
 #endif\r
 \r
-//#ifndef WIN32\r
-       /* HACKS */\r
-#define max(a,b) (a>b?a:b)\r
-#define min(a,b) (a<b?a:b)\r
-#define GetTickCount() 0\r
-//#endif // !WIN32\r
-\r
 #include "Engine/engine.h"\r
 #include "Engine/game.h"\r
 #include "Playground.h"\r