super-tux-commit — Messages about commits to the sourcecode.

[Super-tux-commit] supertux/data supertux.strf,1.27,1.28

[Ryan F. <sik...@us...>]

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

Modified Files:
	supertux.strf 
Log Message:
- added Benjamin's squished flyingsnoballs

Index: supertux.strf
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/supertux.strf,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- supertux.strf	28 Apr 2004 13:45:35 -0000	1.27
+++ supertux.strf	12 May 2004 15:51:35 -0000	1.28
@@ -431,9 +431,9 @@
                  "shared/flyingsnowball-left-1.png"))
 
  (sprite (name "flyingsnowball-squished")
-         (x-hotspot 1)
-         (y-hotspot -19)
-         (images "shared/snowball-squished-left.png"))
+         (x-hotspot 4)
+         (y-hotspot -12)
+         (images "shared/flyingsnowball-squished-left.png"))
 
  (sprite (name "spiky-left")
          (x-hotspot 6)

[Super-tux-commit] supertux/data/images/shared flyingsnowball-squished-left.png,NONE,1.1 flyingsnowball-squished-right.png,NONE,1.1

[Ryan F. <sik...@us...>]

Update of /cvsroot/super-tux/supertux/data/images/shared
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32706/images/shared

Added Files:
	flyingsnowball-squished-left.png 
	flyingsnowball-squished-right.png 
Log Message:
- added Benjamin's squished flyingsnoballs

--- NEW FILE: flyingsnowball-squished-left.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: flyingsnowball-squished-right.png ---
(This appears to be a binary file; contents omitted.)

[Super-tux-commit] supertux/src worldmap.cpp,1.68,1.69 worldmap.h,1.28,1.29 gameloop.cpp,1.124,1.125 gameloop.h,1.48,1.49

[Ryan F. <sik...@us...>]

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

Modified Files:
	worldmap.cpp worldmap.h gameloop.cpp gameloop.h 
Log Message:
- fixed some enums

Index: gameloop.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- gameloop.h	29 Apr 2004 00:15:10 -0000	1.48
+++ gameloop.h	12 May 2004 15:36:16 -0000	1.49
@@ -73,7 +73,7 @@
   std::string subset;
 
  public:
-  enum ExitStatus { NONE, LEVEL_FINISHED, GAME_OVER, LEVEL_ABORT };
+  enum ExitStatus { ES_NONE, ES_LEVEL_FINISHED, ES_GAME_OVER, ES_LEVEL_ABORT };
  private:
   ExitStatus exit_status;
  public:

Index: worldmap.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- worldmap.cpp	8 May 2004 10:45:52 -0000	1.68
+++ worldmap.cpp	12 May 2004 15:36:15 -0000	1.69
@@ -36,18 +36,18 @@
 {
   switch(direction)
     {
-    case WEST:
-      return EAST;
-    case EAST:
-      return WEST;
-    case NORTH:
-      return SOUTH;
-    case SOUTH:
-      return NORTH;
-    case NONE:
-      return NONE;
+    case D_WEST:
+      return D_EAST;
+    case D_EAST:
+      return D_WEST;
+    case D_NORTH:
+      return D_SOUTH;
+    case D_SOUTH:
+      return D_NORTH;
+    case D_NONE:
+      return D_NONE;
     }
-  return NONE;
+  return D_NONE;
 }
 
 std::string
@@ -55,13 +55,13 @@
 {
   switch(direction)
     {
-    case WEST:
+    case D_WEST:
       return "west";
-    case EAST:
+    case D_EAST:
       return "east";
-    case NORTH:
+    case D_NORTH:
       return "north";
-    case SOUTH:
+    case D_SOUTH:
       return "south";
     default:
       return "none";
@@ -72,15 +72,15 @@
 string_to_direction(const std::string& directory)
 {
   if (directory == "west")
-    return WEST;
+    return D_WEST;
   else if (directory == "east")
-    return EAST;
+    return D_EAST;
   else if (directory == "north")
-    return NORTH;
+    return D_NORTH;
   else if (directory == "south")
-    return SOUTH;
+    return D_SOUTH;
   else
-    return NONE;
+    return D_NONE;
 }
 
 TileManager::TileManager()
@@ -173,8 +173,8 @@
   moving = false;
   tile_pos.x = 4;
   tile_pos.y = 5;
-  direction = NONE;
-  input_direction = NONE;
+  direction = D_NONE;
+  input_direction = D_NONE;
 }
 
 Tux::~Tux()
@@ -214,19 +214,19 @@
 
   switch(direction)
     {
-    case WEST:
+    case D_WEST:
       x -= offset - 32;
       break;
-    case EAST:
+    case D_EAST:
       x += offset - 32;
       break;
-    case NORTH:
+    case D_NORTH:
       y -= offset - 32;
       break;
-    case SOUTH:
+    case D_SOUTH:
       y += offset - 32;
       break;
-    case NONE:
+    case D_NONE:
       break;
     }
   
@@ -237,7 +237,7 @@
 Tux::stop()
 {
   offset = 0;
-  direction = NONE;
+  direction = D_NONE;
   moving = false;
 }
 
@@ -246,7 +246,7 @@
 {
   if (!moving)
     {
-      if (input_direction != NONE)
+      if (input_direction != D_NONE)
         { 
           WorldMap::Level* level = worldmap->at_level();
 
@@ -288,18 +288,18 @@
               if (worldmap->at(tile_pos)->auto_walk)
                 { // Turn to a new direction
                   Tile* tile = worldmap->at(tile_pos);
-                  Direction dir = NONE;
+                  Direction dir = D_NONE;
                   
-                  if (tile->north && back_direction != NORTH)
-                    dir = NORTH;
-                  else if (tile->south && back_direction != SOUTH)
-                    dir = SOUTH;
-                  else if (tile->east && back_direction != EAST)
-                    dir = EAST;
-                  else if (tile->west && back_direction != WEST)
-                    dir = WEST;
+                  if (tile->north && back_direction != D_NORTH)
+                    dir = D_NORTH;
+                  else if (tile->south && back_direction != D_SOUTH)
+                    dir = D_SOUTH;
+                  else if (tile->east && back_direction != D_EAST)
+                    dir = D_EAST;
+                  else if (tile->west && back_direction != D_WEST)
+                    dir = D_WEST;
 
-                  if (dir != NONE)
+                  if (dir != D_NONE)
                     {
                       direction = dir;
                       back_direction = reverse_dir(direction);
@@ -352,7 +352,7 @@
   leveldot_green = new Surface(datadir +  "/images/worldmap/leveldot_green.png", USE_ALPHA);
   leveldot_red = new Surface(datadir +  "/images/worldmap/leveldot_red.png", USE_ALPHA);
 
-  input_direction = NONE;
+  input_direction = D_NONE;
   enter_level = false;
 
   name = "<no file>";
@@ -493,7 +493,7 @@
 WorldMap::get_input()
 {
   enter_level = false;
-  input_direction = NONE;
+  input_direction = D_NONE;
    
   SDL_Event event;
   while (SDL_PollEvent(&event))
@@ -529,16 +529,16 @@
               if (event.jaxis.axis == joystick_keymap.x_axis)
                 {
                   if (event.jaxis.value < -joystick_keymap.dead_zone)
-                    input_direction = WEST;
+                    input_direction = D_WEST;
                   else if (event.jaxis.value > joystick_keymap.dead_zone)
-                    input_direction = EAST;
+                    input_direction = D_EAST;
                 }
               else if (event.jaxis.axis == joystick_keymap.y_axis)
                 {
                   if (event.jaxis.value > joystick_keymap.dead_zone)
-                    input_direction = SOUTH;
+                    input_direction = D_SOUTH;
                   else if (event.jaxis.value < -joystick_keymap.dead_zone)
-                    input_direction = NORTH;
+                    input_direction = D_NORTH;
                 }
               break;
 
@@ -560,13 +560,13 @@
       Uint8 *keystate = SDL_GetKeyState(NULL);
   
       if (keystate[SDLK_LEFT])
-        input_direction = WEST;
+        input_direction = D_WEST;
       else if (keystate[SDLK_RIGHT])
-        input_direction = EAST;
+        input_direction = D_EAST;
       else if (keystate[SDLK_UP])
-        input_direction = NORTH;
+        input_direction = D_NORTH;
       else if (keystate[SDLK_DOWN])
-        input_direction = SOUTH;
+        input_direction = D_SOUTH;
     }
 }
 
@@ -575,19 +575,19 @@
 {
   switch(direction)
     {
-    case WEST:
+    case D_WEST:
       pos.x -= 1;
       break;
-    case EAST:
+    case D_EAST:
       pos.x += 1;
       break;
-    case NORTH:
+    case D_NORTH:
       pos.y -= 1;
       break;
-    case SOUTH:
+    case D_SOUTH:
       pos.y += 1;
       break;
-    case NONE:
+    case D_NONE:
       break;
     }
   return pos;
@@ -607,19 +607,19 @@
     { // Check if we the tile allows us to go to new_pos
       switch(direction)
         {
-        case WEST:
+        case D_WEST:
           return (at(old_pos)->west && at(*new_pos)->east);
 
-        case EAST:
+        case D_EAST:
           return (at(old_pos)->east && at(*new_pos)->west);
 
-        case NORTH:
+        case D_NORTH:
           return (at(old_pos)->north && at(*new_pos)->south);
 
-        case SOUTH:
+        case D_SOUTH:
           return (at(old_pos)->south && at(*new_pos)->north);
 
-        case NONE:
+        case D_NONE:
           assert(!"path_ok() can't work if direction is NONE");
         }
       return false;
@@ -643,7 +643,7 @@
 
               switch (session.run())
                 {
-                case GameSession::LEVEL_FINISHED:
+                case GameSession::ES_LEVEL_FINISHED:
                   {
                     bool old_level_state = level->solved;
                     level->solved = true;
@@ -658,20 +658,20 @@
                     if (old_level_state != level->solved)
                       { // Try to detect the next direction to which we should walk
                         // FIXME: Mostly a hack
-                        Direction dir = NONE;
+                        Direction dir = D_NONE;
                     
                         Tile* tile = at(tux->get_tile_pos());
 
-                        if (tile->north && tux->back_direction != NORTH)
-                          dir = NORTH;
-                        else if (tile->south && tux->back_direction != SOUTH)
-                          dir = SOUTH;
-                        else if (tile->east && tux->back_direction != EAST)
-                          dir = EAST;
-                        else if (tile->west && tux->back_direction != WEST)
-                          dir = WEST;
+                        if (tile->north && tux->back_direction != D_NORTH)
+                          dir = D_NORTH;
+                        else if (tile->south && tux->back_direction != D_SOUTH)
+                          dir = D_SOUTH;
+                        else if (tile->east && tux->back_direction != D_EAST)
+                          dir = D_EAST;
+                        else if (tile->west && tux->back_direction != D_WEST)
+                          dir = D_WEST;
 
-                        if (dir != NONE)
+                        if (dir != D_NONE)
                           {
                             tux->set_direction(dir);
                             //tux->update(delta);
@@ -695,7 +695,7 @@
                   }
 
                   break;
-                case GameSession::LEVEL_ABORT:
+                case GameSession::ES_LEVEL_ABORT:
                   // Reseting the player_status might be a worthy
                   // consideration, but I don't think we need it
                   // 'cause only the bad players will use it to
@@ -704,11 +704,11 @@
                   // then stop playing the game all together since it
                   // is to hard)
                   break;
-                case GameSession::GAME_OVER:
+                case GameSession::ES_GAME_OVER:
                   quit = true;
                   player_status.reset();
                   break;
-                case GameSession::NONE:
+                case GameSession::ES_NONE:
                   // Should never be reached 
                   break;
                 }

Index: gameloop.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- gameloop.cpp	10 May 2004 21:54:22 -0000	1.124
+++ gameloop.cpp	12 May 2004 15:36:15 -0000	1.125
@@ -76,7 +76,7 @@
 GameSession::restart_level()
 {
   game_pause   = false;
-  exit_status  = NONE;
+  exit_status  = ES_NONE;
   end_sequence = NO_ENDSEQUENCE;
 
   fps_timer.init(true);
@@ -183,7 +183,7 @@
 
   if(st_gl_mode == ST_GL_TEST)
     {
-      exit_status = LEVEL_ABORT;
+      exit_status = ES_LEVEL_ABORT;
     }
   else if (!Menu::current())
     {
@@ -441,7 +441,7 @@
     }
   else if(end_sequence && !endsequence_timer.check())
     {
-      exit_status = LEVEL_FINISHED;
+      exit_status = ES_LEVEL_FINISHED;
       return;
     }
   else if(end_sequence == ENDSEQUENCE_RUNNING && endtile && endtile->data >= 1)
@@ -465,7 +465,7 @@
           if(st_gl_mode != ST_GL_TEST)
             drawendscreen();
           
-          exit_status = GAME_OVER;
+          exit_status = ES_GAME_OVER;
         }
       else
         { // Still has lives, so reset Tux to the levelstart
@@ -479,7 +479,7 @@
 void
 GameSession::action(double frame_ratio)
 {
-  if (exit_status == NONE)
+  if (exit_status == ES_NONE)
     {
       // Update Tux and the World
       world->action(frame_ratio);
@@ -529,7 +529,7 @@
               break;
             case MNID_ABORTLEVEL:
               st_pause_ticks_stop();
-              exit_status = LEVEL_ABORT;
+              exit_status = ES_LEVEL_ABORT;
               break;
             }
         }
@@ -560,7 +560,7 @@
 
   draw();
 
-  while (exit_status == NONE)
+  while (exit_status == ES_NONE)
     {
       /* Calculate the movement-factor */
       double frame_ratio = ((double)(update_time-last_update_time))/((double)FRAME_RATE);

Index: worldmap.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- worldmap.h	27 Apr 2004 18:44:19 -0000	1.28
+++ worldmap.h	12 May 2004 15:36:15 -0000	1.29
@@ -81,7 +81,7 @@
   Tile* get(int i);
 };
 
-enum Direction { NONE, WEST, EAST, NORTH, SOUTH };
+enum Direction { D_NONE, D_WEST, D_EAST, D_NORTH, D_SOUTH };
 
 std::string direction_to_string(Direction d);
 Direction   string_to_direction(const std::string& d);

[Super-tux-commit] supertux TODO,1.43,1.44

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

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

Modified Files:
	TODO 
Log Message:
Added the "Tux doesn't fall between two tiles" bug.

Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- TODO	12 May 2004 12:12:14 -0000	1.43
+++ TODO	12 May 2004 14:59:39 -0000	1.44
@@ -17,6 +17,7 @@
     or just backup those variables before starting a level.
 [M] When jumping into a brick and there is a powerup, it should change direction or not,
     depending where the collision was. It currently sucks.
+[M] Tux should fall while walking in tiles that have a space between.
 [L] time runs while being in in-game menu, at least a bit (jump, go to
    menu, wait a bit, leave menu, Tux will 'flip' to the ground,
    instead of fall, pause mode doesn't seem to have this problem, only

[Super-tux-commit] supertux/src leveleditor.cpp,1.111,1.112

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

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

Modified Files:
	leveleditor.cpp 
Log Message:
In case the level has been saved, and no change was done, don't ask to "Save the Changes".

Index: leveleditor.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- leveleditor.cpp	12 May 2004 02:10:13 -0000	1.111
+++ leveleditor.cpp	12 May 2004 14:57:16 -0000	1.112
@@ -682,6 +682,7 @@
   le_level_subset->title = subset_settings_menu->item[2].input;
   le_level_subset->description = subset_settings_menu->item[3].input;
   le_level_subset->save();
+  le_level_changed = false;
 }
 
 void le_unload_level()

[Super-tux-commit] supertux/src level.cpp,1.69,1.70

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

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

Modified Files:
	level.cpp 
Log Message:
Break lines on tiles as requested by Ryan.
Also added a few spaces for enemies and added a comment saying that the level was made using the built-in level editor.

Index: level.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- level.cpp	11 May 2004 18:26:27 -0000	1.69
+++ level.cpp	12 May 2004 14:54:04 -0000	1.70
@@ -555,7 +555,7 @@
 
 
   /* Write header: */
-  fprintf(fi,";SuperTux-Level\n");
+  fprintf(fi,";SuperTux level made using the built-in leveleditor\n");
   fprintf(fi,"(supertux-level\n");
 
   fprintf(fi,"  (version %d)\n", 1);
@@ -586,6 +586,7 @@
     {
       for(int i = 0; i < width; ++i)
         fprintf(fi," %d ", bg_tiles[y][i]);
+      fprintf(fi,"\n");
     }
 
   fprintf( fi,")\n");
@@ -595,6 +596,7 @@
     {
       for(int i = 0; i < width; ++i)
         fprintf(fi," %d ", ia_tiles[y][i]);
+      fprintf(fi,"\n");
     }
 
   fprintf( fi,")\n");
@@ -604,6 +606,7 @@
     {
       for(int i = 0; i < width; ++i)
         fprintf(fi," %d ", fg_tiles[y][i]);
+      fprintf(fi,"\n");
     }
 
   fprintf( fi,")\n");
@@ -619,7 +622,7 @@
   for(std::vector<BadGuyData>::iterator it = badguy_data.begin();
       it != badguy_data.end();
       ++it)
-    fprintf( fi,"(%s (x %d) (y %d) (stay-on-platform %s))\n",
+    fprintf( fi,"  (%s (x %d) (y %d) (stay-on-platform %s))\n",
              badguykind_to_string((*it).kind).c_str(),(*it).x,(*it).y,
              it->stay_on_platform ? "#t" : "#f");
 

[Super-tux-commit] supertux/src world.cpp,1.80,1.81

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

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

Modified Files:
	world.cpp 
Log Message:
Just changed the vertical scrolling to the top of the scrolling func or else it wouldn't work when autoscrolling is enabled..

Index: world.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- world.cpp	12 May 2004 12:18:47 -0000	1.80
+++ world.cpp	12 May 2004 12:40:46 -0000	1.81
@@ -323,6 +323,22 @@
 /* This functions takes cares of the scrolling */
 void World::scrolling(double frame_ratio)
 {
+  /* Y-axis scrolling */
+
+  float tux_pos_y = tux.base.y + (tux.base.height/2);
+
+  if (scroll_y < tux_pos_y - (screen->h - Y_SPACE))
+    scroll_y = tux_pos_y - (screen->h - Y_SPACE);
+  else if (scroll_y > tux_pos_y - Y_SPACE)
+    scroll_y = tux_pos_y - Y_SPACE;
+
+  // this code prevent the screen to scroll before the start or after the level's end
+  if(scroll_y < 0)
+    scroll_y = 0;
+  if(scroll_y > level->height * 32 - screen->h)
+    scroll_y = level->height * 32 - screen->h;
+
+  /* X-axis scrolling */
 
   /* Auto scrolling */
   if(level->hor_autoscroll_speed)
@@ -379,21 +395,6 @@
     scroll_x = 0;
   if(scroll_x > level->width * 32 - screen->w)
     scroll_x = level->width * 32 - screen->w;
-
-  /* Y-axis scrolling */
-
-  float tux_pos_y = tux.base.y + (tux.base.height/2);
-
-  if (scroll_y < tux_pos_y - (screen->h - Y_SPACE))
-    scroll_y = tux_pos_y - (screen->h - Y_SPACE);
-  else if (scroll_y > tux_pos_y - Y_SPACE)
-    scroll_y = tux_pos_y - Y_SPACE;
-
-  // this code prevent the screen to scroll before the start or after the level's end
-  if(scroll_y < 0)
-    scroll_y = 0;
-  if(scroll_y > level->height * 32 - screen->h)
-    scroll_y = level->height * 32 - screen->h;
 }
 
 void

[Super-tux-commit] supertux/src world.cpp,1.79,1.80

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

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

Modified Files:
	world.cpp 
Log Message:
Smoother vertical scrolling.
You can play a bit with Y_SPACE, in case you want to tune it more.

Index: world.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- world.cpp	12 May 2004 01:29:29 -0000	1.79
+++ world.cpp	12 May 2004 12:18:47 -0000	1.80
@@ -310,9 +310,13 @@
   }
 }
 
-// the space that it takes for the screen to start scrolling, regarding
-// screen bounds (in pixels)
+/* the space that it takes for the screen to start scrolling, regarding
+/* screen bounds (in pixels) */
+// should be higher than screen->w/2 (320)
 #define X_SPACE (400-16)
+// should be less than screen->h/2 (240)
+#define Y_SPACE 200
+
 // the time it takes to move the camera (in ms)
 #define CHANGE_DIR_SCROLL_SPEED 2000
 
@@ -380,7 +384,10 @@
 
   float tux_pos_y = tux.base.y + (tux.base.height/2);
 
-  scroll_y = tux_pos_y - (screen->h / 2);
+  if (scroll_y < tux_pos_y - (screen->h - Y_SPACE))
+    scroll_y = tux_pos_y - (screen->h - Y_SPACE);
+  else if (scroll_y > tux_pos_y - Y_SPACE)
+    scroll_y = tux_pos_y - Y_SPACE;
 
   // this code prevent the screen to scroll before the start or after the level's end
   if(scroll_y < 0)

[Super-tux-commit] supertux TODO,1.42,1.43

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

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

Modified Files:
	TODO 
Log Message:
Added two points.
Also removed fixed stuff.

Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- TODO	10 May 2004 20:17:50 -0000	1.42
+++ TODO	12 May 2004 12:12:14 -0000	1.43
@@ -11,11 +11,12 @@
 H: high priority
 L: low priority
 
-[H] Frame ratio code has been changed and so the animation may need tuning.
-    Somebody do some testing and change the definitions regarding this.
+[M] Enemies can get stuck when colliding.
 [M] When aborting a level, lives and score should remain the same as they
     were before. Solution: make more dependency between the game engine and worldmap
     or just backup those variables before starting a level.
+[M] When jumping into a brick and there is a powerup, it should change direction or not,
+    depending where the collision was. It currently sucks.
 [L] time runs while being in in-game menu, at least a bit (jump, go to
    menu, wait a bit, leave menu, Tux will 'flip' to the ground,
    instead of fall, pause mode doesn't seem to have this problem, only
@@ -23,8 +24,6 @@
 [L] Backscroll is really messed up right now :)
 [L] change lispreader to throw exceptions instead of simply assert() on
     syntax error
-[L] tux sometimes makes short jumps in the endsequence, mostly when
-    going through the goal with a small jump, might be old_up related
 [L] fadein/out for intro/extro would be nice
 [L] when bumping a special with 2 blocks at once, it won't change direction
 [L] tux get killed if he kicks a iceblock while at the same time
@@ -50,32 +49,3 @@
   think the options are disabled because they're crossed. Better use a green
   check mark.
 
-Fixed
------
-
-- leveleditor lacks enemies support - fixed
-- points aren't reset when gameover
-- when jumping into the exit with a star, the endgame music will change back to
-  levelmusic after a short time
-- when jupming against the 2nd multiple coin block in a level only 1 coin will
-  come out.
-- when you interrupted the intro (by going to credits for example) and go back
-  to it, tux doesn't jump anymore
-- supertux crashs from time to time - fixed
-- mriceblock doesn't fall down when being squished in the air - fixed
-- It's not possible to duck while jumping - fixed
-- Intro/Extro textspeed is CPU dependent - fixed
-- sometimes the level restarts/you die after collecing a growup - fixed
-- mriceblock doesn't disapear after being kicked my another iceblock,
-  not sure when exactly it happens, might depend on direction or so - fixed
-- Life counter should be decreased once the die-animation starts,
-   not when it ends - fixed
-- background in underground levels scrolls far too slow, makes them
-   hardly playable, since once too easily get focused on the
-   background instead of the playfield - fixed
-- tux can be killed by back bouncing iceblocks in the exit sequence
-   (all enemies should be removed/turned to coins once the exit
-   sequence started) - fixed
-- leveleditor crashs when pressing the button with the levelsettings - fixed
-- titlescreen level doesn't seamlessly wrap around, might be due to the new
-    scrolling code or due to the worldmap doing the drawing - fixed
\ No newline at end of file

[Super-tux-commit] supertux/data/levels/Cold As Ice info,1.1,NONE level1.stl,1.1,NONE level2.stl,1.1,NONE level3.stl,1.1,NONE

[Ryan F. <sik...@us...>]

Update of /cvsroot/super-tux/supertux/data/levels/Cold As Ice
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29438/Cold As Ice

Removed Files:
	info level1.stl level2.stl level3.stl 
Log Message:
- removing old dir

--- level1.stl DELETED ---

--- info DELETED ---

--- level3.stl DELETED ---

--- level2.stl DELETED ---

[Super-tux-commit] supertux/src leveleditor.h,1.9,1.10 leveleditor.cpp,1.110,1.111

[Ryan F. <sik...@us...>]

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

Modified Files:
	leveleditor.h leveleditor.cpp 
Log Message:
- fixed enum bug mentioned by Kevin L. Mitchell on the mailing list

Index: leveleditor.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/leveleditor.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- leveleditor.h	9 May 2004 13:55:54 -0000	1.9
+++ leveleditor.h	12 May 2004 02:10:13 -0000	1.10
@@ -29,11 +29,7 @@
 };
 
 /* selection modes */
-enum {
-  CURSOR,
-  SQUARE,
-  NONE
-};
+enum SelectionMode { CURSOR, SQUARE, NONE };
 
 int leveleditor(char* filename = NULL);
 void newlevel(void);

Index: leveleditor.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- leveleditor.cpp	11 May 2004 18:26:27 -0000	1.110
+++ leveleditor.cpp	12 May 2004 02:10:13 -0000	1.111
@@ -153,7 +153,7 @@
 static GameObject* selected_game_object;
 
 static square selection;
-static int le_selection_mode;
+static SelectionMode le_selection_mode;
 static SDL_Event event;
 TileMapType active_tm;
 
@@ -1727,7 +1727,7 @@
 void le_showhelp()
 {
   bool tmp_show_grid = le_show_grid;
-  int temp_le_selection_mode = le_selection_mode;
+  SelectionMode temp_le_selection_mode = le_selection_mode;
   le_selection_mode = NONE;
   show_selections = true;
   le_show_grid = false;

[Super-tux-commit] supertux/src world.cpp,1.78,1.79

[Ryan F. <sik...@us...>]

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

Modified Files:
	world.cpp 
Log Message:
- removed old code

Index: world.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- world.cpp	11 May 2004 23:37:12 -0000	1.78
+++ world.cpp	12 May 2004 01:29:29 -0000	1.79
@@ -319,57 +319,43 @@
 /* This functions takes cares of the scrolling */
 void World::scrolling(double frame_ratio)
 {
+
+  /* Auto scrolling */
   if(level->hor_autoscroll_speed)
-    {
+  {
     scroll_x += level->hor_autoscroll_speed * frame_ratio;
     return;
-    }
+  }
 
+
+  /* Horizontal backscrolling */
   float tux_pos_x = tux.base.x + (tux.base.width/2);
 
-  if (level->back_scrolling || debug_mode)
-  {
-    if(tux.old_dir != tux.dir && level->back_scrolling)
-      scrolling_timer.start(CHANGE_DIR_SCROLL_SPEED);
+  if(tux.old_dir != tux.dir && level->back_scrolling)
+    scrolling_timer.start(CHANGE_DIR_SCROLL_SPEED);
 
-    if(scrolling_timer.check())
+  if(scrolling_timer.check())
+  {
+    float final_scroll_x;
+    if (tux.physic.get_velocity_x() > 0)
+      final_scroll_x = tux_pos_x - (screen->w - X_SPACE);
+    else if (tux.physic.get_velocity_x() < 0)
+      final_scroll_x = tux_pos_x - X_SPACE;
+    else
     {
-      float final_scroll_x;
-      if (tux.physic.get_velocity_x() > 0)
+      if (tux.dir == RIGHT)
         final_scroll_x = tux_pos_x - (screen->w - X_SPACE);
-      else if (tux.physic.get_velocity_x() < 0)
+      else if (tux.dir == LEFT && level->back_scrolling)
         final_scroll_x = tux_pos_x - X_SPACE;
-      else
-      {
-        if (tux.dir == RIGHT)
-          final_scroll_x = tux_pos_x - (screen->w - X_SPACE);
-        else if (tux.dir == LEFT && level->back_scrolling)
-          final_scroll_x = tux_pos_x - X_SPACE;
-      }
+    }
 
-      scroll_x +=   (final_scroll_x - scroll_x)
-                  / (frame_ratio * (CHANGE_DIR_SCROLL_SPEED / 100))
-                  + (tux.physic.get_velocity_x() * frame_ratio + tux.physic.get_acceleration_x() * frame_ratio * frame_ratio);
-      // std::cerr << tux_pos_x << " " << final_scroll_x << " " << scroll_x << std::endl;
+    scroll_x +=   (final_scroll_x - scroll_x)
+                / (frame_ratio * (CHANGE_DIR_SCROLL_SPEED / 100))
+                + (tux.physic.get_velocity_x() * frame_ratio + tux.physic.get_acceleration_x() * frame_ratio * frame_ratio);
+    // std::cerr << tux_pos_x << " " << final_scroll_x << " " << scroll_x << std::endl;
 
-    }
-    else
-    {
-      if (tux.physic.get_velocity_x() > 0 && scroll_x < tux_pos_x - (screen->w - X_SPACE))
-        scroll_x = tux_pos_x - (screen->w - X_SPACE);
-      else if (tux.physic.get_velocity_x() < 0 && scroll_x > tux_pos_x - X_SPACE && level->back_scrolling)
-        scroll_x = tux_pos_x - X_SPACE;
-      else
-      {
-        if (tux.dir == RIGHT && scroll_x < tux_pos_x - (screen->w - X_SPACE))
-            scroll_x = tux_pos_x - (screen->w - X_SPACE);
-        else if (tux.dir == LEFT && scroll_x > tux_pos_x - X_SPACE && level->back_scrolling)
-            scroll_x = tux_pos_x - X_SPACE;
-      }
-    }
   }
-
-  else /*no debug*/
+  else
   {
     if (tux.physic.get_velocity_x() > 0 && scroll_x < tux_pos_x - (screen->w - X_SPACE))
       scroll_x = tux_pos_x - (screen->w - X_SPACE);
@@ -382,7 +368,6 @@
       else if (tux.dir == LEFT && scroll_x > tux_pos_x - X_SPACE && level->back_scrolling)
           scroll_x = tux_pos_x - X_SPACE;
     }
-
   }
 
   // this code prevent the screen to scroll before the start or after the level's end

[Super-tux-commit] supertux/src special.cpp,1.41,1.42

[Ryan F. <sik...@us...>]

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

Modified Files:
	special.cpp 
Log Message:
- fixed rising specials

Index: special.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- special.cpp	11 May 2004 23:09:33 -0000	1.41
+++ special.cpp	12 May 2004 01:16:33 -0000	1.42
@@ -248,12 +248,13 @@
 Upgrade::draw()
 {
   SDL_Rect dest;
+
   if (base.height < 32)
     {
       /* Rising up... */
 
-      dest.x = (int)(base.x - scroll_x);
-      dest.y = (int)(base.y - scroll_y + 32 - base.height);
+      dest.x = (int)(base.x);
+      dest.y = (int)(base.y + 32 - base.height);
       dest.w = 32;
       dest.h = (int)base.height;
 

[Super-tux-commit] supertux/data/levels/Cold_As_Ice - New directory

[Ryan F. <sik...@us...>]

Update of /cvsroot/super-tux/supertux/data/levels/Cold_As_Ice
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15616/Cold_As_Ice

Log Message:
Directory /cvsroot/super-tux/supertux/data/levels/Cold_As_Ice added to the repository

[Super-tux-commit] supertux/data/levels/Cold As Ice - New directory

[Ryan F. <sik...@us...>]

Update of /cvsroot/super-tux/supertux/data/levels/Cold As Ice
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13327/Cold As Ice

Log Message:
Directory /cvsroot/super-tux/supertux/data/levels/Cold As Ice added to the repository

[Super-tux-commit] supertux/src world.cpp,1.77,1.78

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

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

Modified Files:
	world.cpp 
Log Message:
Bottom tiles were not being drawn right when vertical scrolling was enabled.

Index: world.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- world.cpp	11 May 2004 23:30:50 -0000	1.77
+++ world.cpp	11 May 2004 23:37:12 -0000	1.78
@@ -197,7 +197,7 @@
     }
 
   /* Draw background: */
-  for (y = 0; y < 15; ++y)
+  for (y = 0; y < 16 && y < level->height; ++y)
     {
       for (x = 0; x < 21; ++x)
         {
@@ -207,7 +207,7 @@
     }
 
   /* Draw interactive tiles: */
-  for (y = 0; y < 15; ++y)
+  for (y = 0; y < 16 && y < level->height; ++y)
     {
       for (x = 0; x < 21; ++x)
         {
@@ -241,7 +241,7 @@
     broken_bricks[i]->draw();
 
   /* Draw foreground: */
-  for (y = 0; y < 15; ++y)
+  for (y = 0; y < 16 && y < level->height; ++y)
     {
       for (x = 0; x < 21; ++x)
         {

[Super-tux-commit] supertux/src world.cpp,1.76,1.77

[Ryan F. <sik...@us...>]

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

Modified Files:
	world.cpp 
Log Message:
- fixed vscroll a bit--forgot foreground

Index: world.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- world.cpp	11 May 2004 23:25:06 -0000	1.76
+++ world.cpp	11 May 2004 23:30:50 -0000	1.77
@@ -245,7 +245,7 @@
     {
       for (x = 0; x < 21; ++x)
         {
-          Tile::draw(32*x - fmodf(scroll_x, 32), y * 32,
+          Tile::draw(32*x - fmodf(scroll_x, 32), y * 32 - fmodf(scroll_y, 32),
                      level->fg_tiles[(int)y + (int)(scroll_y / 32)][(int)x + (int)(scroll_x / 32)]);
         }
     }

[Super-tux-commit] supertux/src world.cpp,1.75,1.76

[Ryan F. <sik...@us...>]

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

Modified Files:
	world.cpp 
Log Message:
- fixed vscroll a bit

Index: world.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- world.cpp	11 May 2004 22:12:42 -0000	1.75
+++ world.cpp	11 May 2004 23:25:06 -0000	1.76
@@ -201,7 +201,7 @@
     {
       for (x = 0; x < 21; ++x)
         {
-          Tile::draw(32*x - fmodf(scroll_x, 32), y * 32,
+          Tile::draw(32*x - fmodf(scroll_x, 32), y * 32 - fmodf(scroll_y, 32),
                      level->bg_tiles[(int)y + (int)(scroll_y / 32)][(int)x + (int)(scroll_x / 32)]);
         }
     }
@@ -211,7 +211,7 @@
     {
       for (x = 0; x < 21; ++x)
         {
-          Tile::draw(32*x - fmodf(scroll_x, 32), y * 32,
+          Tile::draw(32*x - fmodf(scroll_x, 32), y * 32 - fmodf(scroll_y, 32),
                      level->ia_tiles[(int)y + (int)(scroll_y / 32)][(int)x + (int)(scroll_x / 32)]);
         }
     }

[Super-tux-commit] supertux/src badguy.cpp,1.69,1.70 player.cpp,1.91,1.92

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

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

Modified Files:
	badguy.cpp player.cpp 
Log Message:
Fixed hotspot square drawing in debug mode.

Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- player.cpp	11 May 2004 22:12:42 -0000	1.91
+++ player.cpp	11 May 2004 23:15:45 -0000	1.92
@@ -632,7 +632,7 @@
     }     
   
   if (debug_mode)
-    fillrect(base.x, base.y, 
+    fillrect(base.x - scroll_x, base.y - scroll_y, 
              base.width, base.height, 75,75,75, 150);
 }
 

Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- badguy.cpp	11 May 2004 22:12:41 -0000	1.69
+++ badguy.cpp	11 May 2004 23:15:43 -0000	1.70
@@ -749,7 +749,7 @@
   sprite->draw(base.x, base.y);
 
   if (debug_mode)
-    fillrect(base.x, base.y, base.width, base.height, 75,0,75, 150);
+    fillrect(base.x - scroll_x, base.y - scroll_y, base.width, base.height, 75,0,75, 150);
 }
 
 void

[Super-tux-commit] supertux/src sprite.cpp,1.8,1.9

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

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

Modified Files:
	sprite.cpp 
Log Message:
Modified draw_part() in sprite class to make use of scroll.

Index: sprite.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/sprite.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- sprite.cpp	11 May 2004 22:12:42 -0000	1.8
+++ sprite.cpp	11 May 2004 23:12:00 -0000	1.9
@@ -89,7 +89,7 @@
   unsigned int frame = get_current_frame();
 
   if (frame < surfaces.size())
-    surfaces[frame]->draw_part(sx, sy, x - x_hotspot, y - y_hotspot, w, h);
+    surfaces[frame]->draw_part(sx, sy, x - x_hotspot - scroll_x, y - y_hotspot - scroll_y , w, h);
 }
 
 void

[Super-tux-commit] supertux/src special.cpp,1.40,1.41

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

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

Modified Files:
	special.cpp 
Log Message:
Upgrades weren't being shown when appearing... fixed!

Index: special.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- special.cpp	11 May 2004 22:12:42 -0000	1.40
+++ special.cpp	11 May 2004 23:09:33 -0000	1.41
@@ -252,8 +252,8 @@
     {
       /* Rising up... */
 
-      dest.x = (int)(base.x);
-      dest.y = (int)(base.y + 32 - base.height);
+      dest.x = (int)(base.x - scroll_x);
+      dest.y = (int)(base.y - scroll_y + 32 - base.height);
       dest.w = 32;
       dest.h = (int)base.height;
 

[Super-tux-commit] supertux/src exceptions.h,NONE,1.1 supertux.cpp,1.16,1.17 lispreader.cpp,1.18,1.19 lispreader.h,1.8,1.9

[Ryan F. <sik...@us...>]

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

Modified Files:
	supertux.cpp lispreader.cpp lispreader.h 
Added Files:
	exceptions.h 
Log Message:
- added exceptions

--- NEW FILE: exceptions.h ---
//  $Id: exceptions.h,v 1.1 2004/05/11 22:16:12 sik0fewl Exp $
//
//  SuperTux -  A Jump'n Run
//  Copyright (C) 2003 Tobias Glaesser <tob...@gm...>
//
//  This program is free software; you can redistribute it and/or
//  modify it under the terms of the GNU General Public License
//  as published by the Free Software Foundation; either version 2
//  of the License, or (at your option) any later version.
//
//  This program is distributed in the hope that it will be useful,
//  but WITHOUT ANY WARRANTY; without even the implied warranty of
//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
//  GNU General Public License for more details.
//
//  You should have received a copy of the GNU General Public License
//  along with this program; if not, write to the Free Software
//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

#ifndef SUPERTUX_EXCEPTIONS_H
#define SUPERTUX_EXCEPTIONS_H

// Exceptions
#include <exception>
#include <string>

class SuperTuxException : public std::exception
{
  public:
    SuperTuxException(const char* _message, const char* _file = "", const unsigned int _line = 0)
      : message(_message), file(_file), line(_line) { };
    virtual ~SuperTuxException() throw() { };

    const char* what() const throw() { return message; };
    const char* what_file() const throw() { return file; };
    const unsigned int what_line() const throw() { return line; };
    
  private:
    const char* message;
    const char* file;
    const unsigned int line;
};

#endif /*SUPERTUX_EXCEPTIONS_H*/

Index: supertux.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/supertux.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- supertux.cpp	5 May 2004 16:07:20 -0000	1.16
+++ supertux.cpp	11 May 2004 22:16:12 -0000	1.17
@@ -20,6 +20,10 @@
 
 #include <sys/types.h>
 #include <ctype.h>
+#include <iostream>
+
+#include <exception>
+#include "exceptions.h"
 
 #include "defines.h"
 #include "globals.h"
@@ -36,40 +40,50 @@
 
 int main(int argc, char * argv[])
 {
-  st_directory_setup();
-  parseargs(argc, argv);
-  
-  st_audio_setup();
-  st_video_setup();
-  st_joystick_setup();
-  st_general_setup();
-  st_menu();
-  loadshared();
+  try {
+    st_directory_setup();
+    parseargs(argc, argv);
 
-  if (launch_leveleditor_mode && level_startup_file)
+    st_audio_setup();
+    st_video_setup();
+    st_joystick_setup();
+    st_general_setup();
+    st_menu();
+    loadshared();
+
+    if (launch_leveleditor_mode && level_startup_file)
     {
     leveleditor(level_startup_file);
     }
-  else if (level_startup_file)
+    else if (level_startup_file)
     {
       GameSession session(level_startup_file, 1, ST_GL_LOAD_LEVEL_FILE);
       session.run();
     }
-  else
+    else
     {  
       title();
     }
-  
-  clearscreen(0, 0, 0);
-  updatescreen();
 
-  unloadshared();
-  st_general_free();
-  TileManager::destroy_instance();
-#ifdef DEBUG
-  Surface::debug_check();
-#endif
-  st_shutdown();
-  
+    clearscreen(0, 0, 0);
+    updatescreen();
+
+    unloadshared();
+    st_general_free();
+    TileManager::destroy_instance();
+    #ifdef DEBUG
+    Surface::debug_check();
+    #endif
+    st_shutdown();
+  }
+  catch (SuperTuxException &e)
+  {
+    std::cerr << "Unhandled SuperTux exception:\n  " << e.what_file() << ":" << e.what_line() << ": " << e.what() << std::endl;
+  }
+  catch (std::exception &e)
+  {
+    std:: cerr << "Unhandled exception: " << e.what() << std::endl;
+  }
+
   return 0;
 }

Index: lispreader.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/lispreader.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- lispreader.cpp	3 May 2004 23:06:19 -0000	1.18
+++ lispreader.cpp	11 May 2004 22:16:12 -0000	1.19
@@ -23,7 +23,6 @@
 
 #include <iostream>
 #include <string>
-#include <assert.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
@@ -64,7 +63,8 @@
 static void
 _token_append (char c)
 {
-  assert(token_length < MAX_TOKEN_LENGTH);
+  if (token_length >= MAX_TOKEN_LENGTH)
+    throw LispReaderException("_token_append()", __FILE__, __LINE__);
 
   token_string[token_length++] = c;
   token_string[token_length] = '\0';
@@ -93,7 +93,8 @@
     case LISP_STREAM_ANY:
       return stream->v.any.next_char(stream->v.any.data);
     }
-  assert(0);
+
+  throw LispReaderException("_next_char()", __FILE__, __LINE__);
   return EOF;
 }
 
@@ -115,7 +116,7 @@
       break;
 
     default :
-      assert(0);
+      throw LispReaderException("_unget_char()", __FILE__, __LINE__);
     }
 }
 
@@ -267,7 +268,7 @@
         }
     }
 
-  assert(0);
+  throw LispReaderException("_scan()", __FILE__, __LINE__);
   return TOKEN_ERROR;
 }
 
@@ -305,7 +306,8 @@
                       int (*next_char) (void *data),
                       void (*unget_char) (char c, void *data))
 {
-  assert(next_char != 0 && unget_char != 0);
+  if (next_char == 0 || unget_char == 0)
+    throw LispReaderException("lisp_stream_init_any()", __FILE__, __LINE__);
 
   stream->type = LISP_STREAM_ANY;
   stream->v.any.data = data;
@@ -493,7 +495,7 @@
       return lisp_make_boolean(0);
     }
 
-  assert(0);
+  throw LispReaderException("lisp_read()", __FILE__, __LINE__);
   return &error_object;
 }
 
@@ -643,7 +645,8 @@
 static int
 _match_pattern_var (lisp_object_t *pattern, lisp_object_t *obj, lisp_object_t **vars)
 {
-  assert(lisp_type(pattern) == LISP_TYPE_PATTERN_VAR);
+  if (lisp_type(pattern) != LISP_TYPE_PATTERN_VAR)
+    throw LispReaderException("_match_pattern_var", __FILE__, __LINE__);
 
   switch (pattern->v.pattern.type)
     {
@@ -687,7 +690,8 @@
 
         for (sub = pattern->v.pattern.sub; sub != 0; sub = lisp_cdr(sub))
           {
-            assert(lisp_type(sub) == LISP_TYPE_CONS);
+            if (lisp_type(sub) != LISP_TYPE_CONS)
+              throw LispReaderException("_match_pattern_var()", __FILE__, __LINE__);
 
             if (_match_pattern(lisp_car(sub), obj, vars))
               matched = 1;
@@ -699,7 +703,7 @@
       break;
 
     default :
-      assert(0);
+      throw LispReaderException("_match_pattern_var()", __FILE__, __LINE__);
     }
 
   if (vars != 0)
@@ -749,7 +753,7 @@
       break;
 
     default :
-      assert(0);
+      throw LispReaderException("_match_pattern()", __FILE__, __LINE__);
     }
 
   return 0;
@@ -804,7 +808,8 @@
 int
 lisp_integer (lisp_object_t *obj)
 {
-  assert(obj->type == LISP_TYPE_INTEGER);
+  if (obj->type != LISP_TYPE_INTEGER)
+    throw LispReaderException("lisp_integer()", __FILE__, __LINE__);
 
   return obj->v.integer;
 }
@@ -812,7 +817,8 @@
 char*
 lisp_symbol (lisp_object_t *obj)
 {
-  assert(obj->type == LISP_TYPE_SYMBOL);
+  if (obj->type != LISP_TYPE_SYMBOL)
+    throw LispReaderException("lisp_symbol()", __FILE__, __LINE__);
 
   return obj->v.string;
 }
@@ -820,7 +826,8 @@
 char*
 lisp_string (lisp_object_t *obj)
 {
-  assert(obj->type == LISP_TYPE_STRING);
+  if (obj->type != LISP_TYPE_STRING)
+    throw LispReaderException("lisp_string()", __FILE__, __LINE__);
 
   return obj->v.string;
 }
@@ -828,7 +835,8 @@
 int
 lisp_boolean (lisp_object_t *obj)
 {
-  assert(obj->type == LISP_TYPE_BOOLEAN);
+  if (obj->type != LISP_TYPE_BOOLEAN)
+    throw LispReaderException("lisp_boolean()", __FILE__, __LINE__);
 
   return obj->v.integer;
 }
@@ -836,7 +844,8 @@
 float
 lisp_real (lisp_object_t *obj)
 {
-  assert(obj->type == LISP_TYPE_REAL || obj->type == LISP_TYPE_INTEGER);
+  if (obj->type != LISP_TYPE_REAL && obj->type != LISP_TYPE_INTEGER)
+    throw LispReaderException("lisp_real()", __FILE__, __LINE__);
 
   if (obj->type == LISP_TYPE_INTEGER)
     return obj->v.integer;
@@ -846,7 +855,8 @@
 lisp_object_t*
 lisp_car (lisp_object_t *obj)
 {
-  assert(obj->type == LISP_TYPE_CONS || obj->type == LISP_TYPE_PATTERN_CONS);
+  if (obj->type != LISP_TYPE_CONS && obj->type != LISP_TYPE_PATTERN_CONS)
+    throw LispReaderException("lisp_car()", __FILE__, __LINE__);
 
   return obj->v.cons.car;
 }
@@ -854,7 +864,8 @@
 lisp_object_t*
 lisp_cdr (lisp_object_t *obj)
 {
-  assert(obj->type == LISP_TYPE_CONS || obj->type == LISP_TYPE_PATTERN_CONS);
+  if (obj->type != LISP_TYPE_CONS && obj->type != LISP_TYPE_PATTERN_CONS)
+    throw LispReaderException("lisp_cdr()", __FILE__, __LINE__);
 
   return obj->v.cons.cdr;
 }
@@ -870,7 +881,7 @@
     else if (x[i] == 'd')
       obj = lisp_cdr(obj);
     else
-      assert(0);
+      throw LispReaderException("lisp_cxr()", __FILE__, __LINE__);
 
   return obj;
 }
@@ -882,7 +893,8 @@
 
   while (obj != 0)
     {
-      assert(obj->type == LISP_TYPE_CONS || obj->type == LISP_TYPE_PATTERN_CONS);
+      if (obj->type != LISP_TYPE_CONS && obj->type != LISP_TYPE_PATTERN_CONS)
+        throw LispReaderException("lisp_list_length()", __FILE__, __LINE__);
 
       ++length;
       obj = obj->v.cons.cdr;
@@ -896,8 +908,10 @@
 {
   while (index > 0)
     {
-      assert(obj != 0);
-      assert(obj->type == LISP_TYPE_CONS || obj->type == LISP_TYPE_PATTERN_CONS);
+      if (obj == 0)
+        throw LispReaderException("lisp_list_nth_cdr()", __FILE__, __LINE__);
+      if (obj->type != LISP_TYPE_CONS && obj->type != LISP_TYPE_PATTERN_CONS)
+        throw LispReaderException("lisp_list_nth_cdr()", __FILE__, __LINE__);
 
       --index;
       obj = obj->v.cons.cdr;
@@ -911,7 +925,8 @@
 {
   obj = lisp_list_nth_cdr(obj, index);
 
-  assert(obj != 0);
+  if (obj == 0)
+    throw LispReaderException("lisp_list_nth()", __FILE__, __LINE__);
 
   return obj->v.cons.car;
 }
@@ -993,7 +1008,7 @@
       break;
 
     default :
-      assert(0);
+      throw LispReaderException("lisp_dump()", __FILE__, __LINE__);
     }
 }
 
@@ -1260,7 +1275,8 @@
   int buf_pos = 0;
   int try_number = 1;
   char* buf = static_cast<char*>(malloc(chunk_size));
-  assert(buf);
+  if (!buf)
+    throw LispReaderException("lisp_read_from_gzfile()", __FILE__, __LINE__);
 
   gzFile in = gzopen(filename, "r");
 
@@ -1270,14 +1286,16 @@
       if (ret == -1)
         {
           free (buf);
-          assert(!"Error while reading from file");
+          throw LispReaderException("Error while reading from file", __FILE__, __LINE__);
         }
       else if (ret == chunk_size) // buffer got full, eof not yet there so resize
         {
           buf_pos = chunk_size * try_number;
           try_number += 1;
           buf = static_cast<char*>(realloc(buf, chunk_size * try_number));
-          assert(buf);
+
+          if (!buf)
+            throw LispReaderException("lisp_read_from_gzfile()", __FILE__, __LINE__);
         }
       else 
         {

Index: lispreader.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/lispreader.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- lispreader.h	25 Mar 2004 11:36:05 -0000	1.8
+++ lispreader.h	11 May 2004 22:16:12 -0000	1.9
@@ -28,6 +28,8 @@
 #include <zlib.h>
 #include <string>
 #include <vector>
+#include <exception>
+#include "exceptions.h"
 
 #define LISP_STREAM_FILE       1
 #define LISP_STREAM_STRING     2
@@ -55,6 +57,14 @@
 #define LISP_PATTERN_LIST       7
 #define LISP_PATTERN_OR         8
 
+// Exception
+class LispReaderException : public SuperTuxException
+{
+  public:
+    LispReaderException(const char* _message = "lispreader error", const char* _file = "", const unsigned int _line = 0)
+      : SuperTuxException(_message, _file, _line) { };
+};
+
 typedef struct
   {
     int type;

[Super-tux-commit] supertux/src badguy.cpp,1.68,1.69 player.cpp,1.90,1.91 special.cpp,1.39,1.40 sprite.cpp,1.7,1.8 world.cpp,1.74,1.75

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

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

Modified Files:
	badguy.cpp player.cpp special.cpp sprite.cpp world.cpp 
Log Message:
Cleanups. Basically I made sprites to care about the scrolling and not the player or badguys or whatever.

Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- player.cpp	11 May 2004 18:16:12 -0000	1.90
+++ player.cpp	11 May 2004 22:12:42 -0000	1.91
@@ -551,7 +551,7 @@
     {
       if (dying == DYING_SQUISHED)
         {
-          smalltux_gameover->draw(base.x - scroll_x, base.y);
+          smalltux_gameover->draw(base.x, base.y);
         }
       else
         {
@@ -567,46 +567,46 @@
           if (duck && size != SMALL)
             {
               if (dir == RIGHT)
-                sprite->duck_right->draw(base.x - scroll_x, base.y);
+                sprite->duck_right->draw(base.x, base.y);
               else 
-                sprite->duck_left->draw(base.x - scroll_x, base.y);
+                sprite->duck_left->draw(base.x, base.y);
             }
           else if (skidding_timer.started())
             {
               if (dir == RIGHT)
-                sprite->skid_right->draw(base.x - scroll_x, base.y);
+                sprite->skid_right->draw(base.x, base.y);
               else
-                sprite->skid_left->draw(base.x - scroll_x, base.y); 
+                sprite->skid_left->draw(base.x, base.y); 
             }
           else if (kick_timer.started())
             {
               if (dir == RIGHT)
-                sprite->kick_right->draw(base.x - scroll_x, base.y);
+                sprite->kick_right->draw(base.x, base.y);
               else
-                sprite->kick_left->draw(base.x - scroll_x, base.y); 
+                sprite->kick_left->draw(base.x, base.y); 
             }
           else if (physic.get_velocity_y() != 0)
             {
               if (dir == RIGHT)
-                sprite->jump_right->draw(base.x - scroll_x, base.y);
+                sprite->jump_right->draw(base.x, base.y);
               else
-                sprite->jump_left->draw(base.x - scroll_x, base.y);                   
+                sprite->jump_left->draw(base.x, base.y);                   
             }
           else
             {
               if (fabsf(physic.get_velocity_x()) < 1.0f) // standing
                 {
                   if (dir == RIGHT)
-                    sprite->stand_right->draw( base.x - scroll_x, base.y);
+                    sprite->stand_right->draw( base.x, base.y);
                   else
-                    sprite->stand_left->draw( base.x - scroll_x, base.y);
+                    sprite->stand_left->draw( base.x, base.y);
                 }
               else // moving
                 {
                   if (dir == RIGHT)
-                    sprite->walk_right->draw(base.x - scroll_x, base.y);
+                    sprite->walk_right->draw(base.x, base.y);
                   else
-                    sprite->walk_left->draw(base.x - scroll_x, base.y);
+                    sprite->walk_left->draw(base.x, base.y);
                 }
             }
                       
@@ -614,9 +614,9 @@
           if (holding_something && physic.get_velocity_y() == 0)
             {
               if (dir == RIGHT)
-                sprite->grab_right->draw(base.x - scroll_x, base.y);
+                sprite->grab_right->draw(base.x, base.y);
               else
-                sprite->grab_left->draw(base.x - scroll_x, base.y);
+                sprite->grab_left->draw(base.x, base.y);
             }
 
           // Draw blinking star overlay
@@ -624,15 +624,15 @@
              (invincible_timer.get_left() > TUX_INVINCIBLE_TIME_WARNING || global_frame_counter % 3))
             {
               if (size == SMALL || duck)
-                smalltux_star->draw(base.x - scroll_x, base.y);
+                smalltux_star->draw(base.x, base.y);
               else
-                largetux_star->draw(base.x - scroll_x, base.y);
+                largetux_star->draw(base.x, base.y);
             }
         }
     }     
   
   if (debug_mode)
-    fillrect(base.x - scroll_x, base.y, 
+    fillrect(base.x, base.y, 
              base.width, base.height, 75,75,75, 150);
 }
 
@@ -673,7 +673,7 @@
                 {
                    pbad_c->dying = DYING_FALLING;
                    play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER);
-                   World::current()->add_score(pbad_c->base.x - scroll_x,
+                   World::current()->add_score(pbad_c->base.x,
                                                pbad_c->base.y,
                                                25 * player_status.score_multiplier);
                 }

Index: sprite.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/sprite.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- sprite.cpp	11 May 2004 21:53:50 -0000	1.7
+++ sprite.cpp	11 May 2004 22:12:42 -0000	1.8
@@ -79,7 +79,7 @@
   unsigned int frame = get_current_frame();
 
   if (frame < surfaces.size())
-    surfaces[frame]->draw(x - x_hotspot, y - y_hotspot - scroll_y);
+    surfaces[frame]->draw(x - x_hotspot - scroll_x, y - y_hotspot - scroll_y);
 }
 
 void

Index: world.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- world.cpp	11 May 2004 21:53:51 -0000	1.74
+++ world.cpp	11 May 2004 22:12:42 -0000	1.75
@@ -325,7 +325,7 @@
     return;
     }
 
-  int tux_pos_x = (int)(tux.base.x + (tux.base.width/2));
+  float tux_pos_x = tux.base.x + (tux.base.width/2);
 
   if (level->back_scrolling || debug_mode)
   {
@@ -393,7 +393,7 @@
 
   /* Y-axis scrolling */
 
-  int tux_pos_y = (int)(tux.base.y + (tux.base.height/2));
+  float tux_pos_y = tux.base.y + (tux.base.height/2);
 
   scroll_y = tux_pos_y - (screen->h / 2);
 
@@ -496,7 +496,7 @@
   player_status.score += s;
 
   FloatingScore* new_floating_score = new FloatingScore();
-  new_floating_score->init(x,y,s);
+  new_floating_score->init(x-scroll_x, y-scroll_y, s);
   floating_scores.push_back(new_floating_score);
 }
 
@@ -504,7 +504,7 @@
 World::add_bouncy_distro(float x, float y)
 {
   BouncyDistro* new_bouncy_distro = new BouncyDistro();
-  new_bouncy_distro->init(x,y);
+  new_bouncy_distro->init(x, y);
   bouncy_distros.push_back(new_bouncy_distro);
 }
 

Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- badguy.cpp	8 May 2004 23:46:43 -0000	1.68
+++ badguy.cpp	11 May 2004 22:12:41 -0000	1.69
@@ -746,10 +746,10 @@
     }
 
   Sprite* sprite = (dir == LEFT) ? sprite_left : sprite_right;
-  sprite->draw(base.x - scroll_x, base.y);
+  sprite->draw(base.x, base.y);
 
   if (debug_mode)
-    fillrect(base.x - scroll_x, base.y, base.width, base.height, 75,0,75, 150);
+    fillrect(base.x, base.y, base.width, base.height, 75,0,75, 150);
 }
 
 void
@@ -810,7 +810,7 @@
 {
   make_player_jump(player);
     
-  World::current()->add_score(base.x - scroll_x,
+  World::current()->add_score(base.x,
                               base.y, 50 * player_status.score_multiplier);
   play_sound(sounds[SND_SQUISH], SOUND_CENTER_SPEAKER);
   player_status.score_multiplier++;
@@ -830,7 +830,7 @@
     World::current()->add_bad_guy(base.x, base.y, BAD_BOMB);
     
     make_player_jump(player);
-    World::current()->add_score(base.x - scroll_x, base.y, 50 * player_status.score_multiplier);
+    World::current()->add_score(base.x, base.y, 50 * player_status.score_multiplier);
     play_sound(sounds[SND_SQUISH], SOUND_CENTER_SPEAKER);
     player_status.score_multiplier++;
     remove_me();
@@ -882,7 +882,7 @@
       
     make_player_jump(player);
 	      
-    World::current()->add_score(base.x - scroll_x, base.y, 25 * player_status.score_multiplier);
+    World::current()->add_score(base.x, base.y, 25 * player_status.score_multiplier);
     player_status.score_multiplier++;
      
     // simply remove the fish...
@@ -922,7 +922,7 @@
   physic.enable_gravity(true);
 
   /* Gain some points: */
-    World::current()->add_score(base.x - scroll_x, base.y,
+    World::current()->add_score(base.x, base.y,
                     score * player_status.score_multiplier);
 
   /* Play death sound: */

Index: special.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- special.cpp	29 Apr 2004 00:15:10 -0000	1.39
+++ special.cpp	11 May 2004 22:12:42 -0000	1.40
@@ -123,7 +123,7 @@
   if (base.x >= scroll_x - base.width &&
       base.x <= scroll_x + screen->w)
     {
-      img_bullet->draw(base.x - scroll_x, base.y);
+      img_bullet->draw(base.x, base.y);
     }
 }
 
@@ -252,7 +252,7 @@
     {
       /* Rising up... */
 
-      dest.x = (int)(base.x - scroll_x);
+      dest.x = (int)(base.x);
       dest.y = (int)(base.y + 32 - base.height);
       dest.w = 32;
       dest.h = (int)base.height;
@@ -271,21 +271,21 @@
       if (kind == UPGRADE_GROWUP)
         {
           img_growup->draw(
-                       base.x - scroll_x, base.y);
+                       base.x, base.y);
         }
       else if (kind == UPGRADE_ICEFLOWER)
         {
           img_iceflower->draw(
-                       base.x - scroll_x, base.y);
+                       base.x, base.y);
         }
       else if (kind == UPGRADE_HERRING)
         {
           img_star->draw(
-                       base.x - scroll_x, base.y);
+                       base.x, base.y);
         }
       else if (kind == UPGRADE_1UP)
         {
-          img_1up->draw( base.x - scroll_x, base.y);
+          img_1up->draw( base.x, base.y);
         }
     }
 }

[Super-tux-commit] supertux/src gameobjs.cpp,1.15,1.16 scene.cpp,1.27,1.28 scene.h,1.28,1.29 sprite.cpp,1.6,1.7 world.cpp,1.73,1.74

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

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

Modified Files:
	gameobjs.cpp scene.cpp scene.h sprite.cpp world.cpp 
Log Message:
First implementation of vertical scrolling.

Index: scene.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/scene.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- scene.cpp	2 May 2004 16:08:22 -0000	1.27
+++ scene.cpp	11 May 2004 21:53:50 -0000	1.28
@@ -69,7 +69,7 @@
 }
 
 // FIXME: Move this into a view class
-float scroll_x;
+float scroll_x, scroll_y;
 
 unsigned int global_frame_counter;
 

Index: sprite.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/sprite.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sprite.cpp	26 Apr 2004 12:21:22 -0000	1.6
+++ sprite.cpp	11 May 2004 21:53:50 -0000	1.7
@@ -79,7 +79,7 @@
   unsigned int frame = get_current_frame();
 
   if (frame < surfaces.size())
-    surfaces[frame]->draw(x - x_hotspot, y - y_hotspot);
+    surfaces[frame]->draw(x - x_hotspot, y - y_hotspot - scroll_y);
 }
 
 void

Index: world.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- world.cpp	10 May 2004 19:06:03 -0000	1.73
+++ world.cpp	11 May 2004 21:53:51 -0000	1.74
@@ -202,7 +202,7 @@
       for (x = 0; x < 21; ++x)
         {
           Tile::draw(32*x - fmodf(scroll_x, 32), y * 32,
-                     level->bg_tiles[(int)y][(int)x + (int)(scroll_x / 32)]);
+                     level->bg_tiles[(int)y + (int)(scroll_y / 32)][(int)x + (int)(scroll_x / 32)]);
         }
     }
 
@@ -212,7 +212,7 @@
       for (x = 0; x < 21; ++x)
         {
           Tile::draw(32*x - fmodf(scroll_x, 32), y * 32,
-                     level->ia_tiles[(int)y][(int)x + (int)(scroll_x / 32)]);
+                     level->ia_tiles[(int)y + (int)(scroll_y / 32)][(int)x + (int)(scroll_x / 32)]);
         }
     }
 
@@ -246,7 +246,7 @@
       for (x = 0; x < 21; ++x)
         {
           Tile::draw(32*x - fmodf(scroll_x, 32), y * 32,
-                     level->fg_tiles[(int)y][(int)x + (int)(scroll_x / 32)]);
+                     level->fg_tiles[(int)y + (int)(scroll_y / 32)][(int)x + (int)(scroll_x / 32)]);
         }
     }
 
@@ -390,6 +390,18 @@
     scroll_x = 0;
   if(scroll_x > level->width * 32 - screen->w)
     scroll_x = level->width * 32 - screen->w;
+
+  /* Y-axis scrolling */
+
+  int tux_pos_y = (int)(tux.base.y + (tux.base.height/2));
+
+  scroll_y = tux_pos_y - (screen->h / 2);
+
+  // this code prevent the screen to scroll before the start or after the level's end
+  if(scroll_y < 0)
+    scroll_y = 0;
+  if(scroll_y > level->height * 32 - screen->h)
+    scroll_y = level->height * 32 - screen->h;
 }
 
 void

Index: scene.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/scene.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- scene.h	2 May 2004 16:08:22 -0000	1.28
+++ scene.h	11 May 2004 21:53:50 -0000	1.29
@@ -46,7 +46,7 @@
 
 extern PlayerStatus player_status;
 
-extern float scroll_x;
+extern float scroll_x, scroll_y;
 extern unsigned int global_frame_counter;
 
 #endif /*SUPERTUX_SCENE_H*/

Index: gameobjs.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameobjs.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- gameobjs.cpp	29 Apr 2004 10:45:24 -0000	1.15
+++ gameobjs.cpp	11 May 2004 21:53:50 -0000	1.16
@@ -54,7 +54,7 @@
 BouncyDistro::draw()
 {
   img_distro[0]->draw(base.x - scroll_x,
-                      base.y);
+                      base.y - scroll_y);
 }
 
 
@@ -98,7 +98,7 @@
   src.h = 16;
 
   dest.x = (int)(base.x - scroll_x);
-  dest.y = (int)base.y;
+  dest.y = (int)(base.y  - scroll_y);
   dest.w = 16;
   dest.h = 16;
   
@@ -147,7 +147,7 @@
       base.x <= scroll_x + screen->w)
     {
       dest.x = (int)(base.x - scroll_x);
-      dest.y = (int)base.y;
+      dest.y = (int)(base.y - scroll_y);
       dest.w = 32;
       dest.h = 32;
 
@@ -157,7 +157,7 @@
       // paint it later at on offseted position
       if(plevel->bkgd_image[0] == '\0')
         {
-          fillrect(base.x - scroll_x, base.y,
+          fillrect(base.x - scroll_x, base.y - scroll_y,
                    32,32, 
                    plevel->bkgd_top.red, plevel->bkgd_top.green, plevel->bkgd_top.blue, 0);
 // FIXME: doesn't respect the gradient, futhermore is this necessary at all??
@@ -170,7 +170,7 @@
         }
 
       Tile::draw(base.x - scroll_x,
-                 base.y + offset,
+                 base.y - scroll_y + offset,
                  shape);
     }
 }

[Super-tux-commit] htdocs authors.xml,1.2,1.3 contact.xml,1.1,1.2 download.xml,1.9,1.10 index.xml,1.3,1.4 screenshots.xml,1.5,1.6 welcome.xml,1.3,1.4

[Ryan F. <sik...@us...>]

Update of /cvsroot/super-tux/htdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14934

Modified Files:
	authors.xml contact.xml download.xml index.xml screenshots.xml 
	welcome.xml 
Log Message:
- some grammar fixes

Index: index.xml
===================================================================
RCS file: /cvsroot/super-tux/htdocs/index.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- index.xml	2 May 2004 21:36:11 -0000	1.3
+++ index.xml	11 May 2004 19:17:04 -0000	1.4
@@ -3,11 +3,11 @@
   <section title="What is SuperTux?">
     <p>
       SuperTux is a classic 2D jump'n run sidescroller game in a
-      similar style like the original SuperMario games. The
+      style similar to the original SuperMario games. The
       'Milestone1' release of SuperTux features 9 enemies, 26 playable
       levels, software and OpenGL rendering modes, configurable
       joystick and keyboard input, new music and completly redone
-      graphics. Together with a little story we hope to provide a good
+      graphics. Together with a little story, we hope to provide a good
       gaming experince with this first Milestone release.
     </p>
 
@@ -16,14 +16,14 @@
     </p>
     <ul>
       <li><a href="milestone1/index.html">The Milestone1 webpage</a>,
-        ie. the one that contains all the information for the next
-        version (the one created for GotM)</li>
+        contains all the information for the next version (the one
+        created for GotM)</li>
       
       <li><a href="development/index.html">The generic Development
-          webpage</a>, ie the one that contains information and ideas
-        for future development, its mainly only here for
-        brainstorming, its not meant to be implemented</li>
+          webpage</a>, contains information and ideas for future development,
+          its mainly only here for brainstorming, it'ss not necessarily meant
+          to be implemented</li>
     </ul>
   </section>
 
-</page>
\ No newline at end of file
+</page>

Index: screenshots.xml
===================================================================
RCS file: /cvsroot/super-tux/htdocs/screenshots.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- screenshots.xml	11 May 2004 12:20:26 -0000	1.5
+++ screenshots.xml	11 May 2004 19:17:04 -0000	1.6
@@ -9,7 +9,7 @@
     <subsection title="SuperTux 0.1.1">
       <p>
         This version basically features the built-in editor that
-        was took off from the previous release (0.1.0), new hand-written fonts
+        was removed from the previous release (0.1.0), new hand-written fonts
         and a few bug fixes.
       </p>
 
@@ -22,9 +22,10 @@
       <subsection title="SuperTux Milestone1 aka 0.1.0">
         <p>
           Milestone1 is in huge parts the result of the GotM event on
-          happypenguin.org, it contains completly new graphics and lots
-          of new levels and also a story and a worldmap. Screenshots
-          below should give you an impression of the game.
+          <a href="http://happypenguin.org">happypenguin.org</a>,
+          it contains completly new graphics, lots of new levels,
+          a story and a worldmap. Screenshots below should give you an
+          impression of the game.
         </p>
 
         <center>
@@ -38,7 +39,7 @@
       <subsubsection title="Flexlay">
         <p>
           Flexlay is the editor that was used to build most of the
-          levels in Milestone1 and the Worldmap. It provides a few
+          levels and the Worldmap in Milestone1. It provides a few
           more features than the build in one (zoom, minimap, worldmap
           support), but requires a few more dependencies and OpenGL on
           the other side.

Index: contact.xml
===================================================================
RCS file: /cvsroot/super-tux/htdocs/contact.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- contact.xml	2 May 2004 21:36:11 -0000	1.1
+++ contact.xml	11 May 2004 19:17:04 -0000	1.2
@@ -2,8 +2,8 @@
 <page title="SuperTux">
   <section title="Contact">
     <p>
-      Development is mainly coordinated via IRC and the mailing lists,
-      be sure to visit both once in a while or you might miss critical
+      Development is mainly coordinated via IRC and the mailing list.
+      Be sure to visit both once in a while or you might miss critical
       stuff.
     </p>
       
@@ -11,7 +11,7 @@
       <dl>
         <dt><a
         href="mailto:sup...@li...">sup...@li...</a>
-        - List for comments critics and everything development
+        - List for comments, criticisms and everything development
         related</dt>
 
         <dd><a href="http://sourceforge.net/mailarchive/forum.php?forum_id=36963">Archive</a></dd>
@@ -21,7 +21,7 @@
       <dl>
         <dt><a
         href="mailto:sup...@li...">sup...@li...</a>
-          - List for commits to CVS, mainly interesting for people working directly with the source</dt>
+          - List for commits to CVS, mainly useful for people working directly with the source</dt>
 
         <dd><a href="http://sourceforge.net/mailarchive/forum.php?forum_id=39400">Archive</a></dd>
         <dd><a href="http://lists.sourceforge.net/mailman/listinfo/super-tux-commit">Subscribe/Unsubscribe</a></dd>
@@ -35,4 +35,4 @@
       </p>
     </subsection>
   </section>
-</page>
\ No newline at end of file
+</page>

Index: authors.xml
===================================================================
RCS file: /cvsroot/super-tux/htdocs/authors.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- authors.xml	29 Apr 2004 12:05:12 -0000	1.2
+++ authors.xml	11 May 2004 19:17:04 -0000	1.3
@@ -2,8 +2,8 @@
 <page title="SuperTux">
   <section title="Authors">
     <p>
-      Here goes the list of the people behind this project:
-      (as a note, noone earns money by making this game, our only incentivation is the amusement of doing it.)
+      Here is list of the people behind this project:
+      (as a note, no one earns money by making this game, our only incentive is the amusement of doing it.)
     </p>
 
 <b>Project leader</b><br/>
@@ -33,10 +33,10 @@
 <br/>
 <b>Contrib Programming</b><br/>
 <br/>
-	Ryan Flegel<br/>
-	xxd...@ho... / http://digitalhell.cjb.net/~ryan/<br/>
+	Ryan (sik0fewl) Flegel<br/>
+	xxd...@ho...<br/>
 <br/>
-	Duong-Khang NGUYEN<br/>
+	Duong-Khang (neoneurone) NGUYEN<br/>
 	neo...@us...<br/>
 <br/>
 <b>Graphics</b><br/>

Index: download.xml
===================================================================
RCS file: /cvsroot/super-tux/htdocs/download.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- download.xml	11 May 2004 12:20:26 -0000	1.9
+++ download.xml	11 May 2004 19:17:04 -0000	1.10
@@ -23,7 +23,7 @@
 
     <subsection title="Older versions">
       <ul>
-        <li>If you feel like being nostalgic, check out our <a href="https://sourceforge.net/project/showfiles.php?group_id=69183">old stuff</a></li>
+        <li>If you feel like being nostalgic, check out our <a href="https://sourceforge.net/project/showfiles.php?group_id=69183">older versions</a></li>
       </ul>
     </subsection>
     
@@ -41,20 +41,17 @@
 
   <section title="Flexlay Editor Download">
     <p>
-      There exist two leveleditors for SuperTux, the build in one
-      that comes with SuperTux and is available via the InGame Menu
-      (not present in 0.1.0, but will be included again in 0.1.1)
-      and the external one, which is known as Flexlay. Flexlay is a
-      seperate project with no webpage yet, however its available
-      via Subversion from:
-    </p>
-    <p>
-      <tt>svn co "svn://clanlib.org/Games/Windstille/trunk/flexlay/</tt>
+      There exist two level editors for SuperTux, the built-in one
+      that comes with SuperTux and is available via the in-game menu
+      (available in 0.1.1 and later) and the external one, which is known
+      as <a href="http://pingus.seul.org/~grumbel/flexlay/">Flexlay.</a>
+      Flexlay is a seperate project that aims to provide level editing
+      capabilities for multiple games.
     </p>
 
     <p>
       It needs <a href="http://www.clanlib.org">ClanLib-0.7-CVS</a>
-      and Guile to compile.
+      and <a href="http://www.gnu.org/software/guile/guile.html">Guile</a> to compile.
     </p>
   </section>
 </page>

Index: welcome.xml
===================================================================
RCS file: /cvsroot/super-tux/htdocs/welcome.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- welcome.xml	2 May 2004 21:36:11 -0000	1.3
+++ welcome.xml	11 May 2004 19:17:04 -0000	1.4
@@ -3,14 +3,12 @@
   <section title="What is SuperTux?">
     <p>
       SuperTux is a classic 2D jump'n run sidescroller game in a
-      similar style like the original SuperMario games. The new
-      <em>Milestone 1</em> release of SuperTux features 9 enemies, 26
-      playable levels, a worldmap that allows you to travel from one
-      level to the next, software and OpenGL rendering modes,
-      configurable joystick and keyboard input, new music and
-      completly redone graphics. Together with a little story we hope
-      to provide a reasonablly good gaming experince with this first
-      Milestone release for the player.
+      style similar to the original SuperMario games. The
+      <em>Milestone1</em> release of SuperTux features 9 enemies, 26 playable
+      levels, software and OpenGL rendering modes, configurable
+      joystick and keyboard input, new music and completly redone
+      graphics. Together with a little story, we hope to provide a good
+      gaming experince with this first Milestone release.
     </p>
     
     <p>
@@ -40,4 +38,4 @@
     </p>
   </section>
 
-</page>
\ No newline at end of file
+</page>