super-tux-commit

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

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

Modified Files:
	player.cpp 
Log Message:
Only show combo messages after 5 combos, as suggested by guys from IRC.
I don't particularly like this, but it's better than the current. I'd prefer to keep combos messages being shown after combos been made...

Also, messages could be improved. Suggestions?

Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -d -r1.179 -r1.180
--- player.cpp	3 Oct 2004 10:58:04 -0000	1.179
+++ player.cpp	4 Oct 2004 21:13:16 -0000	1.180
@@ -1172,18 +1172,25 @@
   flapping = false;
   falling_from_flap = false;
   
-  if(player_status.score_multiplier > 1)
-  {  // show a message
+  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);}
-      else 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);}
+//      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.up)
     physic.set_velocity_y(5.2);
   else