[Super-tux-commit] supertux/src defines.h,1.22,1.23 scene.cpp,1.23,1.24 worldmap.cpp,1.43,1.44

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22872/src

Modified Files:
	defines.h scene.cpp worldmap.cpp 
Log Message:
Made a START_LIVES definition (in defines.h) that has the lives that the players start with.
i have made them to be 4, since the worldmap is so hard...

Index: scene.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/scene.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- scene.cpp	21 Apr 2004 23:38:03 -0000	1.23
+++ scene.cpp	22 Apr 2004 20:41:40 -0000	1.24
@@ -19,13 +19,14 @@
 
 #include <stdlib.h>
 #include "scene.h"
+#include "defines.h"
 
 PlayerStatus player_status;
 
 PlayerStatus::PlayerStatus()
   : score(0),
     distros(0),
-    lives(3),
+    lives(START_LIVES),
     score_multiplier(1)
 {
 }

Index: defines.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/defines.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- defines.h	22 Apr 2004 20:14:33 -0000	1.22
+++ defines.h	22 Apr 2004 20:41:39 -0000	1.23
@@ -65,6 +65,10 @@
 #define RUN_SPEED 1.5
 #define JUMP_SPEED 1.2
 
+/* gameplay related defines */
+
+#define START_LIVES 4
+
 #define MAX_BULLETS 1
 
 #define GRAVITY 1.0

Index: worldmap.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- worldmap.cpp	22 Apr 2004 11:17:34 -0000	1.43
+++ worldmap.cpp	22 Apr 2004 20:41:40 -0000	1.44
@@ -820,7 +820,7 @@
       reader.read_int("distros", &player_status.distros);
 
       if (player_status.lives < 0)
-        player_status.lives = 3;
+        player_status.lives = START_LIVES;
 
       lisp_object_t* tux_cur = 0;
       if (reader.read_lisp("tux", &tux_cur))