From: Mario Date: Fri, 19 Jul 2019 23:42:43 +0000 (+1000) Subject: Fix error spam when winning a tic tac toe or push-pull game X-Git-Tag: xonotic-v0.8.5~1457 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=22611d822f25e741b2493e9a27a1e66e41ac72bc;p=xonotic%2Fxonotic-data.pk3dir.git Fix error spam when winning a tic tac toe or push-pull game --- diff --git a/qcsrc/common/minigames/minigame/pp.qc b/qcsrc/common/minigames/minigame/pp.qc index 269d39583..4ea08c5d6 100644 --- a/qcsrc/common/minigames/minigame/pp.qc +++ b/qcsrc/common/minigames/minigame/pp.qc @@ -440,8 +440,8 @@ string pp_turn_to_string(int turnflags) if ( turnflags & PP_TURN_WIN ) { if ( (turnflags&PP_TURN_TEAM) != minigame_self.team ) - return strcat(_("You lost the game!"), "\n", _("Select \"^1Next Match^7\" on the menu for a rematch!")); - return strcat(_("You win!"), "\n", _("Select \"^1Next Match^7\" on the menu to start a new match!")); + return _("You lost the game!\nSelect \"^1Next Match^7\" on the menu for a rematch!"); + return _("You win!\nSelect \"^1Next Match^7\" on the menu to start a new match!"); } if ( turnflags & PP_TURN_NEXT ) diff --git a/qcsrc/common/minigames/minigame/ttt.qc b/qcsrc/common/minigames/minigame/ttt.qc index 0c7c6fb5d..dd7bf3c62 100644 --- a/qcsrc/common/minigames/minigame/ttt.qc +++ b/qcsrc/common/minigames/minigame/ttt.qc @@ -321,8 +321,8 @@ string ttt_turn_to_string(int turnflags) if ( turnflags & TTT_TURN_WIN ) { if ( (turnflags&TTT_TURN_TEAM) != minigame_self.team ) - strcat(_("You lost the game!"), "\n", _("Select \"^1Next Match^7\" on the menu for a rematch!")); - return strcat(_("You win!"), "\n", _("Select \"^1Next Match^7\" on the menu to start a new match!")); + return _("You lost the game!\nSelect \"^1Next Match^7\" on the menu for a rematch!"); // TODO: proper "you win" banner instead of hijacking the help message + return _("You win!\nSelect \"^1Next Match^7\" on the menu to start a new match!"); } if ( turnflags & TTT_TURN_NEXT )