X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fminigames%2Fminigame%2Fbd.qc;h=744dab71af518124cae264d9708fde3f47c189d2;hp=b4195c05774eec2f08d780de5b4ddbff6cc687c5;hb=4b615d6ea3ee6794ea9368c782393c66ef55c170;hpb=bc50c2d7ca3e0a44ed1712400ef8e170e6df8210 diff --git a/qcsrc/common/minigames/minigame/bd.qc b/qcsrc/common/minigames/minigame/bd.qc index b4195c057..744dab71a 100644 --- a/qcsrc/common/minigames/minigame/bd.qc +++ b/qcsrc/common/minigames/minigame/bd.qc @@ -1,5 +1,5 @@ #include "bd.qh" -REGISTER_MINIGAME(bd, "Bulldozer"); +REGISTER_MINIGAME(bd, _("Bulldozer")); REGISTER_NET_LINKED(ENT_CLIENT_BD_CONTROLLER) @@ -727,11 +727,13 @@ bool bd_save_level(entity minigame) int target_count = 0, boulder_count = 0; entity piece = NULL; while((piece = findentity(piece,owner,minigame))) - if(piece.classname == "minigame_board_piece") - if(piece.bd_tiletype == BD_TILE_BOULDER) - ++boulder_count; - else if(piece.bd_tiletype == BD_TILE_TARGET) - ++target_count; + if(piece.classname == "minigame_board_piece") + { + if(piece.bd_tiletype == BD_TILE_BOULDER) + ++boulder_count; + else if(piece.bd_tiletype == BD_TILE_TARGET) + ++target_count; + } if(boulder_count != target_count) { @@ -1087,22 +1089,20 @@ void bd_hud_board(vector pos, vector mySize) if ( (active_minigame.minigame_flags & BD_TURN_LOSS) || (active_minigame.minigame_flags & BD_TURN_WIN) ) { vector winfs = hud_fontsize*2; - string victory_text = "Game over!"; + string victory_text = _("Game over!"); if(active_minigame.minigame_flags & BD_TURN_WIN) - victory_text = "Well done! Click 'Next Level' to continue"; + victory_text = _("Well done! Click 'Next Level' to continue"); vector win_pos = pos+eY*(mySize_y-winfs_y)/2; vector win_sz; win_sz = minigame_drawcolorcodedstring_wrapped(mySize_x,win_pos, - sprintf("%s", victory_text), - winfs, 0, DRAWFLAG_NORMAL, 0.5); + victory_text, winfs, 0, DRAWFLAG_NORMAL, 0.5); drawfill(win_pos-eY*hud_fontsize_y,win_sz+2*eY*hud_fontsize_y,'0.3 0.3 1',0.8,DRAWFLAG_ADDITIVE); minigame_drawcolorcodedstring_wrapped(mySize_x,win_pos, - sprintf("%s", victory_text), - winfs, panel_fg_alpha, DRAWFLAG_NORMAL, 0.5); + victory_text, winfs, panel_fg_alpha, DRAWFLAG_NORMAL, 0.5); } } @@ -1162,10 +1162,12 @@ string bd_turn_to_string(int turnflags) return _("Better luck next time!"); if ( turnflags & BD_TURN_WIN ) + { if(random() > 0.5) return _("Tubular! Press \"Next Level\" to continue!"); else return _("Wicked! Press \"Next Level\" to continue!"); + } if( turnflags & BD_TURN_EDIT ) return _("Press the space bar to change your currently selected tile"); @@ -1309,11 +1311,16 @@ int bd_client_event(entity minigame, string event, ...) { case "activate": { - minigame.message = bd_turn_to_string(minigame.minigame_flags); + strcpy(minigame.message, bd_turn_to_string(minigame.minigame_flags)); bd_set_curr_pos(""); bd_curr_tile = BD_TILE_BRICK1; return false; } + case "deactivate": + { + strfree(minigame.message); + return false; + } case "key_pressed": { if(minigame.minigame_flags & BD_TURN_MOVE) @@ -1368,9 +1375,9 @@ int bd_client_event(entity minigame, string event, ...) { if ( sf & MINIG_SF_UPDATE ) { - sent.message = bd_turn_to_string(sent.minigame_flags); + strcpy(sent.message, bd_turn_to_string(sent.minigame_flags)); //if ( sent.minigame_flags & minigame_self.team ) - minigame_prompt(); + //minigame_prompt(); } } else if(sent.classname == "minigame_board_piece")