Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7684/src
Modified Files:
gameloop.cpp level.cpp leveleditor.cpp player.cpp world.cpp
Log Message:
Fixed some TODO-list bugs.
Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- player.cpp 8 May 2004 14:57:07 -0000 1.87
+++ player.cpp 10 May 2004 19:06:02 -0000 1.88
@@ -709,6 +709,8 @@
physic.enable_gravity(true);
physic.set_acceleration(0, 0);
physic.set_velocity(0, 7);
+ if(dying != DYING_SQUISHED)
+ --player_status.lives;
dying = DYING_SQUISHED;
}
}
Index: level.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- level.cpp 10 May 2004 16:09:49 -0000 1.67
+++ level.cpp 10 May 2004 19:06:02 -0000 1.68
@@ -238,7 +238,7 @@
gravity = 10.;
back_scrolling = false;
hor_autoscroll_speed = 0;
- bkgd_speed = 2;
+ bkgd_speed = 50;
bkgd_top.red = 0;
bkgd_top.green = 0;
bkgd_top.blue = 0;
@@ -320,7 +320,7 @@
hor_autoscroll_speed = 0;
reader.read_float("hor_autoscroll_speed", &hor_autoscroll_speed);
- bkgd_speed = 2;
+ bkgd_speed = 50;
reader.read_int("bkgd_speed", &bkgd_speed);
Index: world.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- world.cpp 10 May 2004 14:38:53 -0000 1.72
+++ world.cpp 10 May 2004 19:06:03 -0000 1.73
@@ -180,7 +180,7 @@
/* Draw the real background */
if(level->img_bkgd)
{
- int s = (int)((float)scroll_x * ((float)level->bkgd_speed/60.)) % screen->w;
+ int s = (int)((float)scroll_x * ((float)level->bkgd_speed/100.0f)) % screen->w;
level->img_bkgd->draw_part(s, 0,0,0,level->img_bkgd->w - s, level->img_bkgd->h);
level->img_bkgd->draw_part(0, 0,screen->w - s ,0,s,level->img_bkgd->h);
}
Index: gameloop.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- gameloop.cpp 4 May 2004 16:03:48 -0000 1.121
+++ gameloop.cpp 10 May 2004 19:06:01 -0000 1.122
@@ -424,6 +424,7 @@
last_x_pos = -1;
music_manager->play_music(level_end_song, 0);
endsequence_timer.start(7000);
+ tux->invincible_timer.start(7000); //FIXME: Implement a winning timer for the end sequence (with special winning animation etc.)
}
else if(end_sequence && !endsequence_timer.check())
{
@@ -440,11 +441,11 @@
last_x_pos = -1;
music_manager->play_music(level_end_song, 0);
endsequence_timer.start(7000); // 5 seconds until we finish the map
+ tux->invincible_timer.start(7000); //FIXME: Implement a winning timer for the end sequence (with special winning animation etc.)
}
else if (!end_sequence && tux->is_dead())
{
player_status.bonus = PlayerStatus::NO_BONUS;
- player_status.lives -= 1;
if (player_status.lives < 0)
{ // No more lives!?
Index: leveleditor.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- leveleditor.cpp 10 May 2004 17:04:56 -0000 1.106
+++ leveleditor.cpp 10 May 2004 19:06:02 -0000 1.107
@@ -911,7 +911,7 @@
/* Draw the real background */
if(le_world->get_level()->bkgd_image[0] != '\0')
{
- s = (int)((float)pos_x * ((float)le_world->get_level()->bkgd_speed/60.)) % screen->w;
+ s = (int)((float)pos_x * ((float)le_world->get_level()->bkgd_speed/100.0f)) % screen->w;
le_world->get_level()->img_bkgd->draw_part(s,0,0,0,
le_world->get_level()->img_bkgd->w - s - 32, le_world->get_level()->img_bkgd->h);
le_world->get_level()->img_bkgd->draw_part(0,0,screen->w - s - 32 ,0,s,
|
