From: Ricardo Cruz Date: Mon, 4 Oct 2004 21:13:16 +0000 (+0000) Subject: Only show combo messages after 5 combos, as suggested by guys from IRC. X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=19d6684cbd42c45943b7d967647148d7cbca8c7e;p=supertux.git 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? SVN-Revision: 1977 --- diff --git a/src/player.cpp b/src/player.cpp index 88e95a4b2..6ac1971a6 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -1172,18 +1172,25 @@ Player::bounce(BadGuy* badguy) 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