From: Matthijs Kooijman <m.kooijman@student.utwente.nl>
Date: Sun, 10 Jun 2007 18:43:38 +0000 (+0200)
Subject:  * Remove some hacks.
X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2FABM2.git;a=commitdiff_plain;h=c0066ee748d25faed654973d09fab4d90ed5cc51

 * Remove some hacks.
 * Move GetTickCount hack to profiler.h
---

diff --git a/ABM2/Engine/profiler.h b/ABM2/Engine/profiler.h
index 77eee05..5a5ad32 100755
--- a/ABM2/Engine/profiler.h
+++ b/ABM2/Engine/profiler.h
@@ -3,6 +3,9 @@
 
 #define MAX_PROFILER_SAMPLES 50
 
+/* HACK to make things compile */
+#define GetTickCount() 0
+
 class IProfilerOutputHandler;
 class CProfileSample;
 
diff --git a/ABM2/main.cpp b/ABM2/main.cpp
index 7348a15..48dcd73 100755
--- a/ABM2/main.cpp
+++ b/ABM2/main.cpp
@@ -4,13 +4,6 @@
 #include <windowsx.h>
 #endif
 
-//#ifndef WIN32
-	/* HACKS */
-#define max(a,b) (a>b?a:b)
-#define min(a,b) (a<b?a:b)
-#define GetTickCount() 0
-//#endif // !WIN32
-
 #include "Engine/engine.h"
 #include "Engine/game.h"
 #include "Playground.h"