X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fminigames%2Fminigame%2Fnmm.qc;h=72b65e75691ede0428b7cf4acffd85ee37c96506;hb=5f22a2a699389fbdff74a80d48559f52106999fa;hp=d36c5cd3f617d6cdffe475caaf54b466f27e8a83;hpb=5c9dd3786d57cbbbca67043ba8076548c1d486ef;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/minigames/minigame/nmm.qc b/qcsrc/common/minigames/minigame/nmm.qc
index d36c5cd3f..72b65e756 100644
--- a/qcsrc/common/minigames/minigame/nmm.qc
+++ b/qcsrc/common/minigames/minigame/nmm.qc
@@ -1,4 +1,10 @@
-REGISTER_MINIGAME(nmm, "Nine Men's Morris");
+#include "nmm.qh"
+
+#ifdef CSQC
+#include <client/miscfunctions.qh>
+#endif
+
+REGISTER_MINIGAME(nmm, _("Nine Men's Morris"));
 
 const int NMM_TURN_PLACE = 0x0100; // player has to place a piece on the board
 const int NMM_TURN_MOVE  = 0x0200; // player has to move a piece by one tile
@@ -120,9 +126,9 @@ void nmm_kill_tiles(entity minig)
 	while ( ( e = findentity(e,owner,minig) ) )
 		if ( e.classname == "minigame_nmm_tile" )
 		{
-			strunzone(e.netname);
-			strunzone(e.nmm_tile_hmill);
-			strunzone(e.nmm_tile_vmill);
+			strfree(e.netname);
+			strfree(e.nmm_tile_hmill);
+			strfree(e.nmm_tile_vmill);
 			delete(e);
 		}
 }
@@ -369,7 +375,7 @@ int nmm_server_event(entity minigame, string event, ...)
 				minigame.SendFlags |= MINIG_SF_UPDATE;
 			}
 			else
-				LOG_TRACE("Invalid move: ",...(2,string),"\n");
+				LOG_TRACE("Invalid move: ", ...(2, string));
 			return 1;
 		}
 	}
@@ -473,22 +479,22 @@ void nmm_hud_board(vector pos, vector mySize)
 	if ( active_minigame.minigame_flags & NMM_TURN_WIN )
 	{
 		vector winfs = hud_fontsize*2;
-		string playername = "";
+		string pname = "";
 		FOREACH_MINIGAME_ENTITY(e)
 			if ( e.classname == "minigame_player" &&
 					e.team == (active_minigame.minigame_flags & NMM_TURN_TEAM) )
-				playername = entcs_GetName(e.minigame_playerslot-1);
+				pname = entcs_GetName(e.minigame_playerslot-1);
 
 		vector win_pos = pos+eY*(mySize_y-winfs_y)/2;
 		vector win_sz;
 		win_sz = minigame_drawcolorcodedstring_wrapped(mySize_x,win_pos,
-			sprintf("%s^7 won the game!",playername),
+			sprintf(_("%s^7 won the game!"), pname),
 			winfs, 0, DRAWFLAG_NORMAL, 0.5);
 
 		drawfill(win_pos-eY*hud_fontsize_y,win_sz+2*eY*hud_fontsize_y,'1 1 1',0.5,DRAWFLAG_ADDITIVE);
 
 		minigame_drawcolorcodedstring_wrapped(mySize_x,win_pos,
-			sprintf("%s^7 won the game!",playername),
+			sprintf(_("%s^7 won the game!"), pname),
 			winfs, panel_fg_alpha, DRAWFLAG_NORMAL, 0.5);
 	}
 }
@@ -496,9 +502,8 @@ void nmm_hud_board(vector pos, vector mySize)
 // Required function, draw the game status panel
 void nmm_hud_status(vector pos, vector mySize)
 {
-	HUD_Panel_DrawBg(1);
+	HUD_Panel_DrawBg();
 	vector ts;
-
 	ts = minigame_drawstring_wrapped(mySize_x,pos,active_minigame.descriptor.message,
 		hud_fontsize * 2, '0.25 0.47 0.72', panel_fg_alpha, DRAWFLAG_NORMAL,0.5);
 	pos_y += ts_y;
@@ -623,12 +628,13 @@ int nmm_client_event(entity minigame, string event, ...)
 	{
 		nmm_fromtile = NULL;
 		nmm_init_tiles(minigame);
-		minigame.message = nmm_turn_to_string(minigame.minigame_flags);
+		strcpy(minigame.message, nmm_turn_to_string(minigame.minigame_flags));
 	}
 	else if ( event == "deactivate" )
 	{
 		nmm_fromtile = NULL;
 		nmm_kill_tiles(minigame);
+		strfree(minigame.message);
 	}
 	else if ( event == "key_pressed" && (minigame.minigame_flags&NMM_TURN_TEAM) == minigame_self.team )
 	{
@@ -750,7 +756,7 @@ int nmm_client_event(entity minigame, string event, ...)
 		}
 		else if ( sent.classname == "minigame" && ( ...(1,int) & MINIG_SF_UPDATE ) )
 		{
-			sent.message = nmm_turn_to_string(sent.minigame_flags);
+			strcpy(sent.message, nmm_turn_to_string(sent.minigame_flags));
 			if ( sent.minigame_flags & minigame_self.team )
 				minigame_prompt();
 		}