From 4ef0a10bf9990816f60cfe0f0d4d5131ba08b5cd Mon Sep 17 00:00:00 2001
From: Olle Rosenquist <phobos99@gmail.com>
Date: Sat, 21 Jul 2007 19:03:50 +0000
Subject: Updated stuff

---
 src/game/game.h | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'src/game/game.h')

diff --git a/src/game/game.h b/src/game/game.h
index 5f69ef9e..64dcc685 100644
--- a/src/game/game.h
+++ b/src/game/game.h
@@ -18,6 +18,10 @@ inline float get_angle(baselib::vec2 dir)
 	return a;
 }
 
+#define LERP(a,b,t) (a + (b-a) * t)
+#define min(a, b) ( a > b ? b : a)
+#define max(a, b) ( a > b ? a : b)
+
 inline bool col_check_point(float x, float y) { return col_check_point((int)x, (int)y) != 0; }
 inline bool col_check_point(baselib::vec2 p) { return col_check_point(p.x, p.y); }
 
@@ -34,6 +38,7 @@ enum
 	EVENT_DAMAGEINDICATION,
 	EVENT_SOUND,
 	EVENT_SMOKE,
+	EVENT_SPAWN,
 };
 
 enum
@@ -75,6 +80,11 @@ struct ev_explosion
 	int x, y;
 };
 
+struct ev_spawn
+{
+	int x, y;
+};
+
 struct ev_sound
 {
 	int x, y;
@@ -152,9 +162,6 @@ enum
 	POWERUP_TYPE_TIMEFIELD		= 4,
 	POWERUP_TYPE_NUMPOWERUPS,
 
-	PLAYER_MAXHEALTH			= 10,
-	PLAYER_MAXARMOR				= 10,
-
 	MODIFIER_TYPE_NINJA			= 0,
 	MODIFIER_TYPE_TIMEFIELD		= 1,
 	MODIFIER_NUMMODIFIERS,
-- 
cgit 1.4.1