-converted remaining classes to GameObject

[supertux.git] / src / defines.h

diff --git a/src/defines.h b/src/defines.h
index 2810cf6..a33d976 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -25,7 +25,7 @@
 /* Version: */
 
 #ifndef VERSION
-       #define VERSION "0.0.5-0.0.6-CVS"
+       #define VERSION "0.1.1"
 #endif
 
 /* Frames per second: */
@@ -48,10 +48,11 @@ enum DyingType {
   DYING_FALLING = 2
 };
 
-/* Screen proprities: */
-/* Don't use this to test for the actual screen sizes. Use screen->w/h instead! */
-#define SCREEN_W 640
-#define SCREEN_H 480
+/* Screen-related stuff */
+// +1 is needed because when tiles are wrapping around the screen there
+//  are two partial tiles on the screen
+#define VISIBLE_TILES_X 25 +1
+#define VISIBLE_TILES_Y 19 +1
 
 /* Sizes: */
 
@@ -74,7 +75,9 @@ enum DyingType {
 
 #define START_LIVES 4
 
-#define MAX_BULLETS 2
+#define MAX_FIRE_BULLETS 2
+#define MAX_ICE_BULLETS  1
+#define FROZEN_TIME 3000
 
 #define YM_FOR_JUMP 6.0
 #define WALK_ACCELERATION_X 0.03