Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10592/src
Modified Files:
scene.cpp scene.h worldmap.cpp player.cpp
Log Message:
Show combos when a new record is reached.
Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -d -r1.194 -r1.195
--- player.cpp 31 Oct 2004 12:36:52 -0000 1.194
+++ player.cpp 31 Oct 2004 15:23:11 -0000 1.195
@@ -352,12 +352,15 @@
/* Reset score multiplier (for multi-hits): */
if (!invincible_timer.started())
{
- /*if(player_status.score_multiplier > 2)
- { // show a message
+ if(player_status.score_multiplier > player_status.max_score_multiplier)
+ {
+ player_status.max_score_multiplier = player_status.score_multiplier;
+
+ // show a message
char str[124];
- sprintf(str, _("%d bad guys in a row!"), player_status.score_multiplier-1);
+ sprintf(str, _("New max combo: %d"), player_status.max_score_multiplier-1);
Sector::current()->add_floating_text(base, str);
- }*/
+ }
player_status.score_multiplier = 1;
}
}
@@ -1266,25 +1269,6 @@
flapping = false;
falling_from_flap = false;
- if(player_status.score_multiplier >= 5)
- { // show a message
- char str[124];
-// if (player_status.score_multiplier <= 4) {sprintf(str, _("Combo x%d"), player_status.score_multiplier);}
- if (player_status.score_multiplier == 5)
- sprintf(str, _("Good! x%d"), player_status.score_multiplier);
- else if (player_status.score_multiplier == 6)
- sprintf(str, _("Great! x%d"), player_status.score_multiplier);
- else if (player_status.score_multiplier == 7)
- sprintf(str, _("Awesome! x%d"), player_status.score_multiplier);
- else if (player_status.score_multiplier == 8)
- sprintf(str, _("Incredible! x%d"), player_status.score_multiplier);
- else if (player_status.score_multiplier == 9)
- sprintf(str, _("Godlike! ;-) x%d"), player_status.score_multiplier);
- else
- sprintf(str, _("Unbelievable!! x%d"), player_status.score_multiplier);
- Sector::current()->add_floating_text(base, str);
- }
-
if (input.jump)
physic.set_velocity_y(5.2);
else
Index: scene.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/scene.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- scene.cpp 14 Sep 2004 22:26:23 -0000 1.34
+++ scene.cpp 31 Oct 2004 15:23:10 -0000 1.35
@@ -28,7 +28,8 @@
: distros(0),
lives(START_LIVES),
bonus(NO_BONUS),
- score_multiplier(1)
+ score_multiplier(1),
+ max_score_multiplier(1)
{
}
@@ -38,6 +39,7 @@
lives = START_LIVES;
bonus = NO_BONUS;
score_multiplier = 1;
+ max_score_multiplier = 1;
}
std::string bonus_to_string(PlayerStatus::BonusType b)
Index: worldmap.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- worldmap.cpp 25 Oct 2004 10:49:07 -0000 1.128
+++ worldmap.cpp 31 Oct 2004 15:23:11 -0000 1.129
@@ -1257,6 +1257,7 @@
writer->write_string("map", map_filename);
writer->write_int("lives", player_status.lives);
writer->write_int("distros", player_status.lives);
+ writer->write_int("max-score-multiplier", player_status.max_score_multiplier);
writer->start_list("tux");
@@ -1330,6 +1331,7 @@
reader.read_int("lives", player_status.lives);
reader.read_int("distros", player_status.distros);
+ reader.read_int("max-score-multiplier", player_status.max_score_multiplier);
if (player_status.lives < 0)
player_status.lives = START_LIVES;
Index: scene.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/scene.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- scene.h 14 Sep 2004 22:26:23 -0000 1.34
+++ scene.h 31 Oct 2004 15:23:11 -0000 1.35
@@ -34,6 +34,7 @@
BonusType bonus;
int score_multiplier;
+ int max_score_multiplier;
PlayerStatus();
|
