super-tux-commit

[Ingo R. <gr...@us...>]

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

Modified Files:
	gameloop.cpp tile.cpp tile.h setup.cpp 
Log Message:
- removed next_tile2, which isn't needed
- added --sdl option to turn of opengl in case it is on in the config file

Index: tile.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/tile.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tile.h	28 Mar 2004 01:00:16 -0000	1.4
+++ tile.h	28 Mar 2004 12:41:11 -0000	1.5
@@ -49,7 +49,6 @@
   /** Id of the tile that is going to replace this tile once it has
       been collected or jumped at */
   int next_tile;
-  int next_tile2;
 
   int anim_speed;
   unsigned char alpha;

Index: setup.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- setup.cpp	28 Mar 2004 01:00:16 -0000	1.21
+++ setup.cpp	28 Mar 2004 12:41:11 -0000	1.22
@@ -929,8 +929,11 @@
 
           use_gl = true;
 #endif
-
         }
+      else if (strcmp(argv[i], "--sdl") == 0)
+          {
+            use_gl = false;
+          }
       else if (strcmp(argv[i], "--usage") == 0)
         {
           /* Show usage: */
@@ -971,6 +974,7 @@
                "  --fullscreen        Run in fullscreen mode.\n"
                "  --opengl            If opengl support was compiled in, this will enable\n"
                "                      the EXPERIMENTAL OpenGL mode.\n"
+               "  --sdl               Use non-opengl renderer\n"
                "\n"
                "Sound Options:\n"
                "  --disable-sound     If sound support was compiled in,  this will\n"

Index: tile.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/tile.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- tile.cpp	25 Mar 2004 11:07:02 -0000	1.5
+++ tile.cpp	28 Mar 2004 12:41:11 -0000	1.6
@@ -48,7 +48,6 @@
               tile->data    = 0;
               tile->alpha   = 0;
               tile->next_tile  = 0;
-              tile->next_tile2 = 0;
               tile->anim_speed = 25;
   
               LispReader reader(lisp_cdr(element));
@@ -62,7 +61,6 @@
               reader.read_int("alpha",      (int*)&tile->alpha);
               reader.read_int("anim-speed", &tile->anim_speed);
               reader.read_int("next-tile",  &tile->next_tile);
-              reader.read_int("next-tile2", &tile->next_tile2);
               reader.read_string_vector("images",  &tile->filenames);
 
 	      for(std::vector<std::string>::iterator it = tile->filenames.begin();

Index: gameloop.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- gameloop.cpp	28 Mar 2004 01:44:15 -0000	1.36
+++ gameloop.cpp	28 Mar 2004 12:41:11 -0000	1.37
@@ -1171,7 +1171,7 @@
             }
           else
             {
-              printf("Tile not dravable %u\n", c);
+              //printf("Tile not dravable %u\n", c);
             }
         }
     }
@@ -1363,7 +1363,7 @@
             }
 
           if (distro_counter <= 0)
-            level_change(&current_level,x, y, TM_IA, tile->next_tile2);
+            level_change(&current_level,x, y, TM_IA, tile->next_tile);
 
           play_sound(sounds[SND_DISTRO], SOUND_CENTER_SPEAKER);
           score = score + SCORE_DISTRO;