Merge branch 'TimePath/classnames' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / minigames / minigame / c4.qc

diff --git a/qcsrc/common/minigames/minigame/c4.qc b/qcsrc/common/minigames/minigame/c4.qc
index a35ada8cdffcb90a1bbea8ce09e88277ea068a30..5aeb7dfb2e4cf13f02de9b5b2e0c6796f78d343a 100644 (file)
--- a/qcsrc/common/minigames/minigame/c4.qc
+++ b/qcsrc/common/minigames/minigame/c4.qc
@@ -163,7 +163,7 @@ void c4_move(entity minigame, entity player, string pos )
                if ( c4_valid_tile(pos) )
                if ( !c4_find_piece(minigame,pos) )
                {
-                       entity piece = msle_spawn(minigame,"minigame_board_piece");
+                       entity piece = msle_spawn(minigame,new(minigame_board_piece));
                        piece.team = player.team;
                        piece.netname = strzone(pos);
                        minigame_server_sendflags(piece,MINIG_SF_ALL);
@@ -413,7 +413,12 @@ int c4_client_event(entity minigame, string event, ...)
                case "activate":
                {
                        c4_set_curr_pos("");
-                       minigame.message = c4_turn_to_string(minigame.minigame_flags);
+                       strcpy(minigame.message, c4_turn_to_string(minigame.minigame_flags));
+                       return false;
+               }
+               case "deactivate":
+               {
+                       strfree(minigame.message);
                        return false;
                }
                case "key_pressed":
@@ -490,7 +495,7 @@ int c4_client_event(entity minigame, string event, ...)
                        {
                                if ( sf & MINIG_SF_UPDATE )
                                {
-                                       sent.message = c4_turn_to_string(sent.minigame_flags);
+                                       strcpy(sent.message, c4_turn_to_string(sent.minigame_flags));
                                        if ( sent.minigame_flags & minigame_self.team )
                                                minigame_prompt();
                                }