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

[Super-tux-commit] supertux/src player.cpp,1.103,1.104

[Marek M. <wa...@us...>]

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

Modified Files:
	player.cpp 
Log Message:
Changed it so that only big Tux is able to butt-jump
Prevented big Tux from being able to slide under one-tile-wide spaces
Now he will just slide out again the direction he came from
That allows to create places where being small Tux is an advantage


Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- player.cpp	18 May 2004 16:57:57 -0000	1.103
+++ player.cpp	18 May 2004 17:12:54 -0000	1.104
@@ -203,7 +203,7 @@
       if(!duck && on_ground() && old_base.x == base.x && old_base.y == base.y
          && collision_object_map(base))
         {
-          base.x += frame_ratio * WALK_SPEED * (dir ? 1 : -1);
+          base.x += frame_ratio * WALK_SPEED;
           previous_base = old_base = base;
         }
 
@@ -417,7 +417,7 @@
       physic.set_velocity_y(0);
     }
 
-  if (input.down == DOWN && !on_ground() && !duck)
+  if (input.down == DOWN && !on_ground() && !duck && size == BIG)
     butt_jump = true;
   else if (input.down == UP)
     butt_jump = false;

Re: [Super-tux-commit] supertux/src level.cpp,1.77,1.78

[Ryan F. <rf...@gm...>]

Just curious, what exactly does this do?

-- 
Ryan

On Tue, 18 May 2004 14:03:56 +0000, Ricardo Cruz
<rm...@us...> wrote:
> 
> Update of /cvsroot/super-tux/supertux/src
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3465/src
> 
> Modified Files:
>         level.cpp
> Log Message:
> I think this fixes image background scrolling.
> Still needs testing.
> 
> Index: level.cpp
> ===================================================================
> RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v
> retrieving revision 1.77
> retrieving revision 1.78
> diff -u -d -r1.77 -r1.78
> --- level.cpp   17 May 2004 17:01:21 -0000      1.77
> +++ level.cpp   18 May 2004 14:03:53 -0000      1.78
> @@ -768,7 +768,7 @@
>    for (int x = 0; (x-1)*img_bkgd->w <= screen->w; x++)
>      for (int y = 0; (y-1)*img_bkgd->h <= screen->h; y++)
>        img_bkgd->draw_part(x == 0 ? sx : 0, y == 0 ? sy : 0,
> -                        x == 0 ? 0 : (img_bkgd->w * x) - sx, y == 0 ? 0 : (img_bkgd->h * y) - sy + (height*32 - screen->h),
> +                        x == 0 ? 0 : (img_bkgd->w * x) - sx, y == 0 ? 0 : (img_bkgd->h * y) - sy,
>                          x == 0 ? img_bkgd->w - sx : img_bkgd->w, y == 0 ? img_bkgd->h - sy : img_bkgd->h);
>  }
> 
> -------------------------------------------------------
> This SF.Net email is sponsored by: SourceForge.net Broadband
> Sign-up now for SourceForge Broadband and get the fastest
> 6.0/768 connection for only $19.95/mo for the first 3 months!
> http://ads.osdn.com/?ad_id=2562&alloc_id=6184&op=click
> _______________________________________________
> Super-tux-commit mailing list
> Sup...@li...
> https://lists.sourceforge.net/lists/listinfo/super-tux-commit
>

[Super-tux-commit] supertux/src player.cpp,1.102,1.103

[Matze B. <mat...@us...>]

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

Modified Files:
	player.cpp 
Log Message:
changed duck mode a bit so that you can only jump a little bit when being ducked and that you can unduck in air

Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- player.cpp	18 May 2004 16:43:37 -0000	1.102
+++ player.cpp	18 May 2004 16:57:57 -0000	1.103
@@ -392,11 +392,15 @@
   // Press jump key
   if(input.up == DOWN && can_jump && on_ground())
     {
-      // jump higher if we are running
-      if (fabs(physic.get_velocity_x()) > MAX_WALK_XM)
-        physic.set_velocity_y(5.8);
-      else
-        physic.set_velocity_y(5.2);
+      if(duck) { // only jump a little bit when in duck mode {
+        physic.set_velocity_y(3);
+      } else {
+        // jump higher if we are running
+        if (fabs(physic.get_velocity_x()) > MAX_WALK_XM)
+          physic.set_velocity_y(5.8);
+        else
+          physic.set_velocity_y(5.2);
+      }
 
       --base.y;
       jumping = true;
@@ -492,13 +496,21 @@
       // changing base size confuses collision otherwise
       old_base = previous_base = base;
     }
-  else if(input.down == UP && size == BIG && duck && physic.get_velocity_y() == 0 && on_ground())
+  else if(input.down == UP && size == BIG && duck)
     {
-      duck = false;
+      // try if we can really unduck
       base.y -= 32;
       base.height = 64;
-      // changing base size confuses collision otherwise
-      old_base = previous_base = base;                        
+      // when unducking in air we need some space to do so
+      if(on_ground() || !collision_object_map(base)) {
+        duck = false;
+        // changing base size confuses collision otherwise
+        old_base = previous_base = base;                                
+      } else {
+        // undo the ducking changes
+        base.y += 32;
+        base.height = 32;
+      }   
     }
 }
 

[Super-tux-commit] supertux/src player.cpp,1.101,1.102 world.cpp,1.97,1.98 world.h,1.40,1.41

[Matze B. <mat...@us...>]

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

Modified Files:
	player.cpp world.cpp world.h 
Log Message:
fixed butt jump to work even when up-key is not pressed, added a little jump after breaking a brick. The thing still has problems with breaking the correct fix, as the used position is not the actual one, but the target position for the next frame, so you can break some bricks that aren't reachable normally

Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- player.cpp	18 May 2004 14:16:37 -0000	1.101
+++ player.cpp	18 May 2004 16:43:37 -0000	1.102
@@ -390,32 +390,27 @@
 Player::handle_vertical_input()
 {
   // Press jump key
-  if(input.up == DOWN && can_jump)
+  if(input.up == DOWN && can_jump && on_ground())
     {
-      if (on_ground())
-        {
-          // jump higher if we are running
-          if (fabs(physic.get_velocity_x()) > MAX_WALK_XM)
-            physic.set_velocity_y(5.8);
-          else
-            physic.set_velocity_y(5.2);
+      // jump higher if we are running
+      if (fabs(physic.get_velocity_x()) > MAX_WALK_XM)
+        physic.set_velocity_y(5.8);
+      else
+        physic.set_velocity_y(5.2);
 
-          --base.y;
-          jumping = true;
-          can_jump = false;
-          if (size == SMALL)
-            play_sound(sounds[SND_JUMP], SOUND_CENTER_SPEAKER);
-          else
-            play_sound(sounds[SND_BIGJUMP], SOUND_CENTER_SPEAKER);
-        }
+      --base.y;
+      jumping = true;
+      can_jump = false;
+      if (size == SMALL)
+        play_sound(sounds[SND_JUMP], SOUND_CENTER_SPEAKER);
+      else
+        play_sound(sounds[SND_BIGJUMP], SOUND_CENTER_SPEAKER);
     }
   // Let go of jump key
-  else if(input.up == UP && jumping)
+  else if(input.up == UP && jumping && physic.get_velocity_y() > 0)
     {
       jumping = false;
-      if(physic.get_velocity_y() > 0) {
-        physic.set_velocity_y(0);
-      }
+      physic.set_velocity_y(0);
     }
 
   if (input.down == DOWN && !on_ground() && !duck)
@@ -424,15 +419,15 @@
     butt_jump = false;
   if (input.down == DOWN && butt_jump && on_ground())
   {
-    if (isbrick(base.x, base.y + base.height))
-      World::current()->trybreakbrick(base.x, base.y + base.height, false);
-    if (isbrick(base.x + base.width, base.y + base.height))
-      World::current()->trybreakbrick(base.x + base.width, base.y + base.height, false);
-
+    if(World::current()->trybreakbrick(base.x, base.y + base.height, false)
+      || World::current()->trybreakbrick(
+          base.x + base.width, base.y + base.height, false)) {
+        // make tux jumping a little bit again after breaking the bricks
+        physic.set_velocity_y(2);
+    }
     butt_jump = false;
   }
 
-
   if ( (issolid(base.x + base.width / 2, base.y + base.height + 64) ||
         issolid(base.x + 1, base.y + base.height + 64) ||
         issolid(base.x + base.width - 1, base.y + base.height + 64))
@@ -457,13 +452,9 @@
 
   if (on_ground() && input.up == UP)
     can_jump = true;
-  if (input.up == DOWN || (input.up == UP && jumping))
-    {
-      handle_vertical_input();
-    }
+  handle_vertical_input();
 
   /* Shoot! */
-
   if (input.fire == DOWN && input.old_fire == UP && got_power != NONE_POWER)
     {
       World::current()->add_bullet(base.x, base.y, physic.get_velocity_x(), dir);

Index: world.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- world.h	16 May 2004 01:36:54 -0000	1.40
+++ world.h	18 May 2004 16:43:37 -0000	1.41
@@ -111,7 +111,7 @@
   void trygrabdistro(float x, float y, int bounciness);
 
   /** Try to break the brick at the given coordinates */
-  void trybreakbrick(float x, float y, bool small);
+  bool trybreakbrick(float x, float y, bool small);
 
   /** Try to get the content out of a bonus box, thus emptying it */
   void tryemptybox(float x, float y, Direction col_side);

Index: world.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- world.cpp	18 May 2004 14:16:38 -0000	1.97
+++ world.cpp	18 May 2004 16:43:37 -0000	1.98
@@ -643,7 +643,7 @@
 }
 
 /* Break a brick: */
-void
+bool
 World::trybreakbrick(float x, float y, bool small)
 {
   Level* plevel = get_level();
@@ -677,6 +677,7 @@
           play_sound(sounds[SND_DISTRO], SOUND_CENTER_SPEAKER);
           player_status.score = player_status.score + SCORE_DISTRO;
           player_status.distros++;
+          return true;
         }
       else if (!small)
         {
@@ -691,8 +692,12 @@
           /* Get some score: */
           play_sound(sounds[SND_BRICK], SOUND_CENTER_SPEAKER);
           player_status.score = player_status.score + SCORE_BRICK;
+          
+          return true;
         }
     }
+
+  return false;
 }
 
 /* Empty a box: */

[Super-tux-commit] supertux/src player.cpp,1.100,1.101 world.cpp,1.96,1.97

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

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

Modified Files:
	player.cpp world.cpp 
Log Message:
Now the player dies when reaching the bottom of the level, even in Y-scrolling levels.

Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- player.cpp	17 May 2004 17:05:22 -0000	1.100
+++ player.cpp	18 May 2004 14:16:37 -0000	1.101
@@ -796,7 +796,8 @@
 
 bool Player::is_dead()
 {
-  if(base.y > World::current()->get_level()->height * /*TILE_HEIGHT*/ 32 || base.x < scroll_x - AUTOSCROLL_DEAD_INTERVAL)  // last condition can happen in auto-scrolling
+  if(base.y > screen->h + scroll_y ||
+      base.x < scroll_x - AUTOSCROLL_DEAD_INTERVAL)  // can happen in auto-scrolling
     return true;
   else
     return false;

Index: world.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- world.cpp	17 May 2004 01:24:24 -0000	1.96
+++ world.cpp	18 May 2004 14:16:38 -0000	1.97
@@ -344,7 +344,7 @@
 
   float tux_pos_y = tux.base.y + (tux.base.height/2);
 
-  if(level->height > VISIBLE_TILES_Y-1)
+  if(level->height > VISIBLE_TILES_Y-1 && !tux.dying)
     {
     if (scroll_y < tux_pos_y - (screen->h - Y_SPACE))
       scroll_y = tux_pos_y - (screen->h - Y_SPACE);

[Super-tux-commit] supertux/src level.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-serv3465/src

Modified Files:
	level.cpp 
Log Message:
I think this fixes image background scrolling.
Still needs testing.

Index: level.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- level.cpp	17 May 2004 17:01:21 -0000	1.77
+++ level.cpp	18 May 2004 14:03:53 -0000	1.78
@@ -768,7 +768,7 @@
   for (int x = 0; (x-1)*img_bkgd->w <= screen->w; x++)
     for (int y = 0; (y-1)*img_bkgd->h <= screen->h; y++)
       img_bkgd->draw_part(x == 0 ? sx : 0, y == 0 ? sy : 0,
-                        x == 0 ? 0 : (img_bkgd->w * x) - sx, y == 0 ? 0 : (img_bkgd->h * y) - sy + (height*32 - screen->h),
+                        x == 0 ? 0 : (img_bkgd->w * x) - sx, y == 0 ? 0 : (img_bkgd->h * y) - sy,
                         x == 0 ? img_bkgd->w - sx : img_bkgd->w, y == 0 ? img_bkgd->h - sy : img_bkgd->h);
 }
 

[Super-tux-commit] supertux/src gameloop.cpp,1.131,1.132

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

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

Modified Files:
	gameloop.cpp 
Log Message:
Just pushed the level info down.

Index: gameloop.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- gameloop.cpp	17 May 2004 14:11:03 -0000	1.131
+++ gameloop.cpp	18 May 2004 14:02:47 -0000	1.132
@@ -151,13 +151,13 @@
     drawgradient(get_level()->bkgd_top, get_level()->bkgd_bottom);
 
   sprintf(str, "%s", world->get_level()->name.c_str());
-  gold_text->drawf(str, 0, 200, A_HMIDDLE, A_TOP, 1);
+  gold_text->drawf(str, 0, 220, A_HMIDDLE, A_TOP, 1);
 
   sprintf(str, "TUX x %d", player_status.lives);
-  white_text->drawf(str, 0, 224, A_HMIDDLE, A_TOP, 1);
+  white_text->drawf(str, 0, 240, A_HMIDDLE, A_TOP, 1);
   
   sprintf(str, "by %s", world->get_level()->author.c_str());
-  white_small_text->drawf(str, 0, 360, A_HMIDDLE, A_TOP, 1);
+  white_small_text->drawf(str, 0, 400, A_HMIDDLE, A_TOP, 1);
   
 
   flipscreen();

[Super-tux-commit] supertux TODO,1.49,1.50

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

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

Modified Files:
	TODO 
Log Message:
- update to TODO

Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- TODO	17 May 2004 23:07:21 -0000	1.49
+++ TODO	17 May 2004 23:15:43 -0000	1.50
@@ -21,7 +21,8 @@
      - Should kill enemies with a certain range
      - Should disable Tux Temporarily
      - Animation (need images)
-     - 
+     - Change controls (just press down while in air, not Up+Down)
+
 [H] Camera movement shouldn't be so fast at the beggining, it takes the focus from
     the game (backscrolling)
 [H] Tux should fall while walking in tiles that have a space between.

[Super-tux-commit] supertux TODO,1.48,1.49

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

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

Modified Files:
	TODO 
Log Message:
- updated TODO with suggestions sent from Torfi to the ml

Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- TODO	17 May 2004 20:04:45 -0000	1.48
+++ TODO	17 May 2004 23:07:21 -0000	1.49
@@ -26,6 +26,9 @@
     the game (backscrolling)
 [H] Tux should fall while walking in tiles that have a space between.
 
+[M] Save score on per-level basis to make high-score
+[M] Save time on per-level basis to make low-time-score
+[M] Add bonus score for extra time left when finishing a level
 [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. - fixed?

[Super-tux-commit] supertux TODO,1.47,1.48

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

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

Modified Files:
	TODO 
Log Message:
- updated TODO

Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- TODO	14 May 2004 08:16:13 -0000	1.47
+++ TODO	17 May 2004 20:04:45 -0000	1.48
@@ -12,30 +12,41 @@
 L: low priority
 
 [H] AX_CHECK_GL produces an error during configure
+[H] Change resolution to 800x600
+     - Levels need to be updated to resolution
+     - Might still be some other bugs to iron out
+[H] Buttjump related things
+     - Right now only breaks bricks beneath tux
+     - Should only work when Tux is bug
+     - Should kill enemies with a certain range
+     - Should disable Tux Temporarily
+     - Animation (need images)
+     - 
+[H] Camera movement shouldn't be so fast at the beggining, it takes the focus from
+    the game (backscrolling)
+[H] Tux should fall while walking in tiles that have a space between.
+
 [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,
+    or just backup those variables before starting a level. - fixed?
+[H] in the "Welcome to Antarctica" level, the blocks next to the first growup
+    look like there are 2 blocks above each other when bumping against them as
+    small tux...
+[H] Enemies should turn upside down after being hit by an kicked
+   iceblock, fireball or bomb
+[H] 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.
-[M] Camera movement shouldn't be so fast at the beggining, it takes the focus from
-    the game.
-[M] Change resolution to 800x600, increasing visible game area.
-[M] Moving platforms
+
+[M] when bumping a special with 2 blocks at once, it won't change direction
+[M] tux get killed if he kicks a iceblock while at the same time
+   bouncing on the roof
+
 [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
    menu)
 [L] catch exceptions thrown by lispreader
 [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
-   bouncing on the roof
-[L] in the "Welcome to Antarctica" level, the blocks next to the first growup
-    look like there are 2 blocks above each other when bumping against them as
-    small tux...
-[L] Enemies should turn upside down after being hit by an kicked
-   iceblock, fireball or bomb
 
 
 Stuff for past milestone1:

[Super-tux-commit] supertux/src player.cpp,1.99,1.100

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

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

Modified Files:
	player.cpp 
Log Message:
- typo fix

Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- player.cpp	17 May 2004 17:01:21 -0000	1.99
+++ player.cpp	17 May 2004 17:05:22 -0000	1.100
@@ -822,7 +822,7 @@
     }
 
   /* Keep in-bounds, vertically: */
-  if (base.y > sWorld::current()->get_level()->height * /*TILE_HEIGHT*/ 32)
+  if (base.y > World::current()->get_level()->height * /*TILE_HEIGHT*/ 32)
     {
       kill(KILL);
     }

[Super-tux-commit] supertux/src badguy.cpp,1.78,1.79 gameobjs.cpp,1.24,1.25 level.cpp,1.76,1.77 player.cpp,1.98,1.99

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

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

Modified Files:
	badguy.cpp gameobjs.cpp level.cpp player.cpp 
Log Message:
- some trampoline changes
- fixed bug mentioned by Marek in the mailing list (I think)

Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- player.cpp	17 May 2004 06:26:41 -0000	1.98
+++ player.cpp	17 May 2004 17:01:21 -0000	1.99
@@ -709,7 +709,7 @@
       ptramp_c = (Trampoline*) p_c_object;
       
       // Pick up trampoline
-      if (ptramp_c->mode != Trampoline::M_HELD && input.fire == DOWN && !holding_something)
+      if (ptramp_c->mode != Trampoline::M_HELD && input.fire == DOWN && !holding_something && on_ground())
       {
         holding_something = true;
         ptramp_c->mode = Trampoline::M_HELD;
@@ -796,7 +796,7 @@
 
 bool Player::is_dead()
 {
-  if(base.y > screen->h || base.x < scroll_x - AUTOSCROLL_DEAD_INTERVAL)  // last condition can happen in auto-scrolling
+  if(base.y > World::current()->get_level()->height * /*TILE_HEIGHT*/ 32 || base.x < scroll_x - AUTOSCROLL_DEAD_INTERVAL)  // last condition can happen in auto-scrolling
     return true;
   else
     return false;
@@ -822,7 +822,7 @@
     }
 
   /* Keep in-bounds, vertically: */
-  if (base.y > screen->h)
+  if (base.y > sWorld::current()->get_level()->height * /*TILE_HEIGHT*/ 32)
     {
       kill(KILL);
     }

Index: gameobjs.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameobjs.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- gameobjs.cpp	17 May 2004 06:26:41 -0000	1.24
+++ gameobjs.cpp	17 May 2004 17:01:21 -0000	1.25
@@ -220,9 +220,10 @@
 
 void load_object_gfx()
 {
+  char sprite_name[16];
+
   for (int i = 0; i < TRAMPOLINE_FRAMES; i++)
   {
-    char sprite_name[16];
     sprintf(sprite_name, "trampoline-%i", i+1);
     img_trampoline[i] = sprite_manager->load(sprite_name);
   }
@@ -257,8 +258,6 @@
 {
   // TODO: Remove if we're too far off the screen
 
-  physic.apply(frame_ratio, base.x, base.y);
-
   // Falling
   if (mode != M_HELD)
   {
@@ -300,6 +299,9 @@
       base.y = tux.base.y + tux.base.height/1.5 - base.height;
     }
   }
+
+  physic.apply(frame_ratio, base.x, base.y);
+  collision_swept_object_map(&old_base, &base);
 }
 
 void
@@ -329,7 +331,7 @@
         else
           frame = 0;
 
-        if (squish_amount < 24)
+        if (squish_amount < 20)
           pplayer_c->physic.set_velocity_y(power);
         else if (pplayer_c->physic.get_velocity_y() < 0)
           pplayer_c->physic.set_velocity_y(-squish_amount/32);

Index: level.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- level.cpp	17 May 2004 01:24:24 -0000	1.76
+++ level.cpp	17 May 2004 17:01:21 -0000	1.77
@@ -233,7 +233,7 @@
   song_title = "Mortimers_chipdisko.mod";
   bkgd_image = "arctis.png";
   width      = 21;
-  height     = 15;
+  height     = 19;
   start_pos_x = 100;
   start_pos_y = 170;
   time_left  = 100;

Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- badguy.cpp	17 May 2004 09:11:58 -0000	1.78
+++ badguy.cpp	17 May 2004 17:01:21 -0000	1.79
@@ -714,7 +714,7 @@
     }
 
   // BadGuy fall below the ground
-  if (base.y > screen->h) {
+  if (base.y > World::current()->get_level()->height * 32) {
     remove_me();
     return;
   }

[Super-tux-commit] supertux/data/music forest-fast.mod,1.1,1.2 forest.mod,1.1,1.2

[Marek M. <wa...@us...>]

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

Modified Files:
	forest-fast.mod forest.mod 
Log Message:
Improved forest tune


Index: forest.mod
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/music/forest.mod,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvszndmTG and /tmp/cvsgh6aC9 differ

Index: forest-fast.mod
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/music/forest-fast.mod,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsZNPEq3 and /tmp/cvsU11dzw differ

[Super-tux-commit] supertux/src gameloop.cpp,1.130,1.131

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

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

Modified Files:
	gameloop.cpp 
Log Message:
Just made the keys UP code go when the menu is called.
This way they are only done once, instead of every time. Doesn't solve anything, it's just cleaner IMO.

Index: gameloop.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- gameloop.cpp	17 May 2004 10:11:43 -0000	1.130
+++ gameloop.cpp	17 May 2004 14:11:03 -0000	1.131
@@ -189,6 +189,16 @@
     }
   else if (!Menu::current())
     {
+      /* Tell Tux that the keys are all down, otherwise
+        it could have nasty bugs, like going allways to the right
+        or whatever that key does */
+      Player& tux = *world->get_tux();
+      tux.key_event((SDLKey)keymap.jump, UP);
+      tux.key_event((SDLKey)keymap.duck, UP);
+      tux.key_event((SDLKey)keymap.left, UP);
+      tux.key_event((SDLKey)keymap.right, UP);
+      tux.key_event((SDLKey)keymap.fire, UP);
+
       Menu::set_current(game_menu);
       st_pause_ticks_start();
     }
@@ -263,18 +273,8 @@
           if (Menu::current())
             {
               Menu::current()->event(event);
-	      if(!Menu::current())
-	      st_pause_ticks_stop();
-
-            /* Tell Tux that the keys are all down, otherwise
-               it could have nasty bugs, like going allways to the right
-               or whatever that key does */
-            Player& tux = *world->get_tux();
-            tux.key_event((SDLKey)keymap.jump, UP);
-            tux.key_event((SDLKey)keymap.duck, UP);
-            tux.key_event((SDLKey)keymap.left, UP);
-            tux.key_event((SDLKey)keymap.right, UP);
-            tux.key_event((SDLKey)keymap.fire, UP);
+              if(!Menu::current())
+                st_pause_ticks_stop();
             }
           else
             {

[Super-tux-commit] supertux/src worldmap.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-serv12576/src

Modified Files:
	worldmap.cpp 
Log Message:
Made player to use the old status when aborting a level.

Index: worldmap.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- worldmap.cpp	16 May 2004 17:44:39 -0000	1.74
+++ worldmap.cpp	17 May 2004 10:15:01 -0000	1.75
@@ -638,6 +638,8 @@
           if (level->x == tux->get_tile_pos().x && 
               level->y == tux->get_tile_pos().y)
             {
+              PlayerStatus old_player_status = player_status;
+
               std::cout << "Enter the current level: " << level->name << std::endl;;
               GameSession session(datadir +  "/levels/" + level->name,
                                   1, ST_GL_LOAD_LEVEL_FILE);
@@ -698,13 +700,9 @@
 
                   break;
                 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
-                  // 'cheat' a few items and that isn't necesarry a
-                  // bad thing (ie. better they continue that way,
-                  // then stop playing the game all together since it
-                  // is to hard)
+                  /* In case the player's abort the level, keep it using the old
+                      status */
+                  player_status = old_player_status;
                   break;
                 case GameSession::ES_GAME_OVER:
                   /* draw an end screen */

[Super-tux-commit] supertux/data/images/title background.jpg,1.1,NONE

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

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

Removed Files:
	background.jpg 
Log Message:
This is a duplication of the arctic image.

--- background.jpg DELETED ---

[Super-tux-commit] supertux/src title.cpp,1.86,1.87

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

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

Modified Files:
	title.cpp 
Log Message:
It was using a duplication of the arctis image.

Index: title.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- title.cpp	17 May 2004 09:13:14 -0000	1.86
+++ title.cpp	17 May 2004 10:13:17 -0000	1.87
@@ -226,7 +226,7 @@
   updatescreen();
 
   /* Load images: */
-  bkg_title = new Surface(datadir + "/images/title/background.jpg", IGNORE_ALPHA);
+  bkg_title = new Surface(datadir + "/images/background/arctis.jpg", IGNORE_ALPHA);
   logo = new Surface(datadir + "/images/title/logo.png", USE_ALPHA);
   img_choose_subset = new Surface(datadir + "/images/status/choose-level-subset.png", USE_ALPHA);
 

[Super-tux-commit] supertux/src intro.cpp,1.21,1.22

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

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

Modified Files:
	intro.cpp 
Log Message:
Fixed a crash. It was using the old name of the background image.

Index: intro.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/intro.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- intro.cpp	2 May 2004 14:56:04 -0000	1.21
+++ intro.cpp	17 May 2004 10:12:19 -0000	1.22
@@ -36,7 +36,7 @@
 void draw_intro()
 {
 if(debug_mode)
-  fade("/images/background/arctis2.jpg", 30, false);
-display_text_file("intro.txt", "/images/background/arctis2.jpg", SCROLL_SPEED_MESSAGE);
+  fade("/images/background/arctis.jpg", 30, false);
+display_text_file("intro.txt", "/images/background/arctis.jpg", SCROLL_SPEED_MESSAGE);
 }
 

[Super-tux-commit] supertux/src gameloop.cpp,1.129,1.130

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

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

Modified Files:
	gameloop.cpp 
Log Message:
Don't open the menu on the end sequence.

Index: gameloop.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- gameloop.cpp	16 May 2004 12:31:31 -0000	1.129
+++ gameloop.cpp	17 May 2004 10:11:43 -0000	1.130
@@ -178,7 +178,7 @@
 void
 GameSession::on_escape_press()
 {
-  if(world->get_tux()->dying)
+  if(world->get_tux()->dying || end_sequence != NO_ENDSEQUENCE)
     return;   // don't let the player open the menu, when he is dying
   if(game_pause)
     return;

[Super-tux-commit] supertux/src title.cpp,1.85,1.86

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

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

Modified Files:
	title.cpp 
Log Message:
Make use of the arctic background instead of the Tux oil one.
I think we should keep the oil Tux for the end of the game credits background... To be like a reward.

Index: title.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- title.cpp	16 May 2004 18:14:19 -0000	1.85
+++ title.cpp	17 May 2004 09:13:14 -0000	1.86
@@ -52,7 +52,6 @@
 #include "resources.h"
 
 static Surface* bkg_title;
-static Surface* bkg_credits;
 static Surface* logo;
 static Surface* img_choose_subset;
 
@@ -228,7 +227,6 @@
 
   /* Load images: */
   bkg_title = new Surface(datadir + "/images/title/background.jpg", IGNORE_ALPHA);
-  bkg_credits = new Surface(datadir + "/images/background/oiltux.jpg", IGNORE_ALPHA);
   logo = new Surface(datadir + "/images/title/logo.png", USE_ALPHA);
   img_choose_subset = new Surface(datadir + "/images/status/choose-level-subset.png", USE_ALPHA);
 
@@ -305,7 +303,7 @@
                   Menu::set_current(main_menu);
                   break;
                 case MNID_CREDITS:
-                  display_text_file("CREDITS", bkg_credits, SCROLL_SPEED_CREDITS);
+                  display_text_file("CREDITS", bkg_title, SCROLL_SPEED_CREDITS);
                   Menu::set_current(main_menu);
                   break;
                 case MNID_QUITMAINMENU:
@@ -373,7 +371,6 @@
 
   free_contrib_menu();
   delete bkg_title;
-  delete bkg_credits;
   delete logo;
   delete img_choose_subset;
 }

[Super-tux-commit] supertux/src badguy.cpp,1.77,1.78 badguy.h,1.40,1.41

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

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

Modified Files:
	badguy.cpp badguy.h 
Log Message:
Added a skelaton for the config bad guys code. Just a rip from the Ingo's tiles code.

Index: badguy.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- badguy.h	13 May 2004 12:44:35 -0000	1.40
+++ badguy.h	17 May 2004 09:11:58 -0000	1.41
@@ -179,6 +179,36 @@
     : kind(BAD_SNOWBALL), x(0), y(0), stay_on_platform(false) {}
 };
 
+class BadGuyManager
+{
+ private:
+  BadGuyManager();
+  ~BadGuyManager();
+  
+  std::vector<BadGuy*> badguys;
+  static BadGuyManager* instance_ ;
+
+  void load_badguys(std::string filename);
+
+ public:
+  static BadGuyManager* instance() { return instance_ ? instance_ : instance_ = new BadGuyManager(); }
+  static void destroy_instance() { delete instance_; instance_ = 0; }
+  
+  BadGuy* get(unsigned int id) {
+    if(id < badguys.size())
+      {
+        return badguys[id]; 
+      }
+    else
+      {
+        // Never return 0, but return the 0th tile instead so that
+        // user code doesn't have to check for NULL pointers all over
+        // the place
+        return badguys[0]; 
+      } 
+  }
+};
+
 #endif /*SUPERTUX_BADGUY_H*/
 
 /* Local Variables: */

Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- badguy.cpp	17 May 2004 06:26:41 -0000	1.77
+++ badguy.cpp	17 May 2004 09:11:58 -0000	1.78
@@ -1196,4 +1196,136 @@
 {
 }
 
+//---------------------------------------------------------------------------
+
+BadGuyManager::BadGuyManager()
+{
+  std::string filename = datadir + "/images/tilesets/supertux.stbg";
+  load_badguys(filename);
+}
+
+BadGuyManager::~BadGuyManager()
+{
+  for(std::vector<BadGuy*>::iterator i = badguys.begin(); i != badguys.end(); ++i) {
+    delete *i;                                                                  
+  }
+}
+
+void BadGuyManager::load_badguys(std::string filename)
+{
+/*
+  lisp_object_t* root_obj = lisp_read_from_file(filename);
+
+  if (!root_obj)
+    st_abort("Couldn't load file", filename);
+
+  if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-badguys") == 0)
+    {
+      lisp_object_t* cur = lisp_cdr(root_obj);
+
+      while(!lisp_nil_p(cur))
+        {
+          lisp_object_t* element = lisp_car(cur);
+
+          if (strcmp(lisp_symbol(lisp_car(element)), "badguy") == 0)
+            {
+	      
+	     
+              Tile* tile = new Tile;
+              tile->id      = -1;
+              tile->solid   = false;
+              tile->brick   = false;
+              tile->ice     = false;
+              tile->water   = false;
+              tile->fullbox = false;
+              tile->distro  = false;
+              tile->goal    = false;
+              tile->data    = 0;
+              tile->next_tile  = 0;
+              tile->anim_speed = 25;
+
+              LispReader reader(lisp_cdr(element));
+              assert(reader.read_int("id",  &tile->id));
+              reader.read_bool("solid",     &tile->solid);
+              reader.read_bool("brick",     &tile->brick);
+              reader.read_bool("ice",       &tile->ice);
+              reader.read_bool("water",     &tile->water);
+              reader.read_bool("fullbox",   &tile->fullbox);
+              reader.read_bool("distro",    &tile->distro);
+              reader.read_bool("goal",      &tile->goal);
+              reader.read_int("data",       &tile->data);
+              reader.read_int("anim-speed", &tile->anim_speed);
+              reader.read_int("next-tile",  &tile->next_tile);
+              reader.read_string_vector("images",  &tile->filenames);
+	      reader.read_string_vector("editor-images", &tile->editor_filenames);
+
+              for(std::vector<std::string>::iterator it = tile->
+                  filenames.begin();
+                  it != tile->filenames.end();
+                  ++it)
+                {
+                  Surface* cur_image;
+                  tile->images.push_back(cur_image);
+                  tile->images[tile->images.size()-1] = new Surface(
+                               datadir +  "/images/tilesets/" + (*it),
+                               USE_ALPHA);
+                }
+              for(std::vector<std::string>::iterator it = tile->editor_filenames.begin();
+                  it != tile->editor_filenames.end();
+                  ++it)
+                {
+                  Surface* cur_image;
+                  tile->editor_images.push_back(cur_image);
+                  tile->editor_images[tile->editor_images.size()-1] = new Surface(
+                               datadir + "/images/tilesets/" + (*it),
+                               USE_ALPHA);
+                }
+		
+              if (tile->id + tileset_id >= int(tiles.size())
+                 )
+                tiles.resize(tile->id + tileset_id+1);
+
+              tiles[tile->id + tileset_id] = tile;
+            }
+          else if (strcmp(lisp_symbol(lisp_car(element)), "tileset") == 0)
+            {
+              LispReader reader(lisp_cdr(element));
+              std::string filename;
+              reader.read_string("file",  &filename);
+              filename = datadir + "/images/tilesets/" + filename;
+              load_tileset(filename);
+            }
+          else if (strcmp(lisp_symbol(lisp_car(element)), "tilegroup") == 0)
+            {
+              TileGroup new_;
+              LispReader reader(lisp_cdr(element));
+              reader.read_string("name",  &new_.name);
+              reader.read_int_vector("tiles", &new_.tiles);	      
+              if(!tilegroups_)
+                tilegroups_ = new std::set<TileGroup>;
+              tilegroups_->insert(new_).first;
+            }
+          else if (strcmp(lisp_symbol(lisp_car(element)), "properties") == 0)
+            {
+              LispReader reader(lisp_cdr(element));
+              reader.read_int("id",  &tileset_id);
+              tileset_id *= 1000;
+            }
+          else
+            {
+              puts("Unhandled symbol");
+            }
+
+          cur = lisp_cdr(cur);
+        }
+    }
+  else
+    {
+      assert(0);
+    }
+
+  lisp_free(root_obj);
+*/
+}
+
 // EOF //

[Super-tux-commit] supertux/src badguy.cpp,1.76,1.77 collision.cpp,1.22,1.23 collision.h,1.12,1.13 gameobjs.cpp,1.23,1.24 player.cpp,1.97,1.98 tile.cpp,1.22,1.23 tile.h,1.19,1.20

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

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

Modified Files:
	badguy.cpp collision.cpp collision.h gameobjs.cpp player.cpp 
	tile.cpp tile.h 
Log Message:
- added spikes

Index: tile.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/tile.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- tile.h	8 May 2004 11:35:04 -0000	1.19
+++ tile.h	17 May 2004 06:26:41 -0000	1.20
@@ -58,12 +58,16 @@
   /** water */
   bool water;
 
+  /** spike - kills player on contact */
+  bool spike;
+
   /** Bonusbox, content is stored in \a data */
   bool fullbox;
 
   /** Tile is a distro/coin */
   bool distro;
 
+
   /** the level should be finished when touching a goaltile.
    * if data is 0 then the endsequence should be triggered, if data is 1
    * then we can finish the level instantly.

Index: collision.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/collision.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- collision.h	16 May 2004 05:48:28 -0000	1.12
+++ collision.h	17 May 2004 06:26:41 -0000	1.13
@@ -54,6 +54,7 @@
 bool  issolid(float x, float y);
 bool  isbrick(float x, float y);
 bool  isice(float x, float y);
+bool  isspike(float x, float y);
 bool  isfullbox(float x, float y);
 
 typedef void* (*tiletestfunction)(Tile* tile);

Index: collision.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/collision.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- collision.cpp	7 May 2004 20:48:21 -0000	1.22
+++ collision.cpp	17 May 2004 06:26:41 -0000	1.23
@@ -263,6 +263,12 @@
   return tile && tile->ice;
 }
 
+bool isspike(float x, float y)
+{
+  Tile* tile = gettile(x,y);
+  return tile && tile->spike;
+}
+
 bool isfullbox(float x, float y)
 {
   Tile* tile = gettile(x,y);

Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- badguy.cpp	16 May 2004 18:44:54 -0000	1.76
+++ badguy.cpp	17 May 2004 06:26:41 -0000	1.77
@@ -719,6 +719,17 @@
     return;
   }
 
+  // Kill us if we landed on spikes
+  if (dying == DYING_NOT
+      && (kind != BAD_STALACTITE && kind != BAD_FLAME && kind != BAD_BOMB)
+      && (isspike(base.x, base.y) || isspike(base.x + base.width, base.y)
+      ||  isspike(base.x, base.y + base.height)
+      ||  isspike(base.x + base.width, base.y + base.height)))
+      {
+         physic.set_velocity_y(3);
+         kill_me(0);
+      }
+
   // Once it's on screen, it's activated!
   if (base.x <= scroll_x + screen->w + OFFSCREEN_DISTANCE)
     seen = true;
@@ -965,6 +976,7 @@
   physic.enable_gravity(true);
 
   /* Gain some points: */
+  if (score != 0)
     World::current()->add_score(base.x, base.y,
                     score * player_status.score_multiplier);
 

Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- player.cpp	17 May 2004 05:35:21 -0000	1.97
+++ player.cpp	17 May 2004 06:26:41 -0000	1.98
@@ -184,6 +184,14 @@
 
       collision_swept_object_map(&old_base, &base);
 
+      if (!invincible_timer.started()
+          && (isspike(base.x, base.y) || isspike(base.x + base.width, base.y)
+          ||  isspike(base.x, base.y + base.height)
+          ||  isspike(base.x + base.width, base.y + base.height)))
+      {
+         kill(SHRINK);
+      }
+
       // Don't accelerate Tux if he is running against a wall
       if (target.x != base.x)
         {

Index: gameobjs.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameobjs.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- gameobjs.cpp	17 May 2004 05:24:40 -0000	1.23
+++ gameobjs.cpp	17 May 2004 06:26:41 -0000	1.24
@@ -255,6 +255,8 @@
 void
 Trampoline::action(double frame_ratio)
 {
+  // TODO: Remove if we're too far off the screen
+
   physic.apply(frame_ratio, base.x, base.y);
 
   // Falling

Index: tile.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/tile.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- tile.cpp	14 May 2004 17:35:30 -0000	1.22
+++ tile.cpp	17 May 2004 06:26:41 -0000	1.23
@@ -91,6 +91,7 @@
               tile->brick   = false;
               tile->ice     = false;
               tile->water   = false;
+              tile->spike   = false;
               tile->fullbox = false;
               tile->distro  = false;
               tile->goal    = false;
@@ -104,6 +105,7 @@
               reader.read_bool("brick",     &tile->brick);
               reader.read_bool("ice",       &tile->ice);
               reader.read_bool("water",     &tile->water);
+              reader.read_bool("spike",     &tile->spike);
               reader.read_bool("fullbox",   &tile->fullbox);
               reader.read_bool("distro",    &tile->distro);
               reader.read_bool("goal",      &tile->goal);

[Super-tux-commit] supertux/data/images/tilesets supertux.stgt,1.34,1.35

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

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

Modified Files:
	supertux.stgt 
Log Message:
- gave spike the spike property

Index: supertux.stgt
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/supertux.stgt,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- supertux.stgt	17 May 2004 05:49:08 -0000	1.34
+++ supertux.stgt	17 May 2004 06:00:25 -0000	1.35
@@ -532,6 +532,7 @@
 
 ; Spike
   (tile (id 200)
+        (spike #t)
         (images "spike.png"))
 
  )

[Super-tux-commit] supertux/data/images/tilesets spike.png,NONE,1.1 supertux.stgt,1.33,1.34

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

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

Modified Files:
	supertux.stgt 
Added Files:
	spike.png 
Log Message:
- added spike tile from Benjamin

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

Index: supertux.stgt
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/supertux.stgt,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- supertux.stgt	13 May 2004 09:41:05 -0000	1.33
+++ supertux.stgt	17 May 2004 05:49:08 -0000	1.34
@@ -12,7 +12,7 @@
  (tilegroup (name "Classic-Bg") (tiles 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101))
  (tilegroup (name "Points") (tiles 132 133))
  (tilegroup (name "Bonus") (tiles 44 83 84 102 140 103 104 105 112 128))
- (tilegroup (name "Misc") (tiles 75 76 79 80 126 127 129 130 134 135 81))
+ (tilegroup (name "Misc") (tiles 75 76 79 80 126 127 129 130 134 135 81 200))
  (tilegroup (name "Pipe") (tiles 53 54 55 56 57 58 59 60))
  (tilegroup (name "Grey") (tiles 64 65 66 67 68 69))
  (tilegroup (name "Signs") (tiles 136 137 138 139 141 142 143 144))
@@ -529,5 +529,10 @@
         (images "grasslands3.png"))
   (tile (id 148)
         (images "grasslands4.png"))
+
+; Spike
+  (tile (id 200)
+        (images "spike.png"))
+
  )
 

[Super-tux-commit] supertux/src player.cpp,1.96,1.97

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

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

Modified Files:
	player.cpp 
Log Message:
- oops. don't need two iostream's.. or do we.. :)

Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- player.cpp	17 May 2004 05:24:40 -0000	1.96
+++ player.cpp	17 May 2004 05:35:21 -0000	1.97
@@ -19,7 +19,6 @@
 
 #include <math.h>
 #include <iostream>
-#include <iostream>
 #include <cassert>
 #include "gameloop.h"
 #include "globals.h"