X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fminigames%2Fcl_minigames.qc;h=ea5596f080108ac6065d95cdb874dbd75478a846;hb=92880db63bb3eae41f73b5d5a994614f595991e7;hp=f896696821d3603d3a6f0a3f08c2596887846e73;hpb=d74c7101cf00af4ab91203c7a56f33dd1cba78db;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/minigames/cl_minigames.qc b/qcsrc/common/minigames/cl_minigames.qc
index f89669682..ea5596f08 100644
--- a/qcsrc/common/minigames/cl_minigames.qc
+++ b/qcsrc/common/minigames/cl_minigames.qc
@@ -42,27 +42,6 @@ bool minigame_hud_mouse_in(vector pos, vector sz)
 	       mousepos_y >= pos_y && mousepos_y < pos_y + sz_y ;
 }
 
-void initialize_minigames()
-{
-	entity last_minig = world;
-	entity minig;
-	#define MINIGAME(name,nicename) \
-		minig = spawn(); \
-		minig.classname = "minigame_descriptor"; \
-		minig.netname = strzone(strtolower(#name)); \
-		minig.message = nicename; \
-		minig.minigame_hud_board = name##_hud_board; \
-		minig.minigame_hud_status = name##_hud_status; \
-		minig.minigame_event = name##_client_event; \
-		if ( !last_minig ) minigame_descriptors = minig; \
-		else last_minig.list_next = minig; \
-		last_minig = minig;
-
-	REGISTERED_MINIGAMES
-
-	#undef MINIGAME
-}
-
 string minigame_texture_skin(string skinname, string name)
 {
 	return sprintf("gfx/hud/%s/minigames/%s", skinname, name);
@@ -95,7 +74,7 @@ MINIGAME_SIMPLELINKED_ENTITIES
 
 void minigame_autoclean_entity(entity e)
 {
-	LOG_DEBUG("CL Auto-cleaned: ",ftos(num_for_edict(e)), " (",e.classname,")\n");
+	LOG_DEBUG("CL Auto-cleaned: ",ftos(etof(e)), " (",e.classname,")\n");
 	remove(e);
 }
 
@@ -174,8 +153,6 @@ void minigame_player_entremove()
 		deactivate_minigame();
 }
 
-vector ReadVector2D() { vector v; v_x = ReadCoord(); v_y = ReadCoord(); v_z = 0; return v; }
-vector ReadVector() { vector v; v_x = ReadCoord(); v_y = ReadCoord(); v_z = ReadCoord(); return v; }
 string() ReadString_Raw = #366;
 string ReadString_Zoned() { return strzone(ReadString_Raw()); }
 #define ReadString ReadString_Zoned
@@ -199,8 +176,8 @@ void minigame_read_owner()
 	if ( !self.owner )
 		LOG_TRACE("Got a minigame entity without a minigame!\n");
 }
-void ent_read_minigame()
-{SELFPARAM();
+NET_HANDLE(ENT_CLIENT_MINIGAME, bool isnew)
+{
 	float sf = ReadByte();
 	if ( sf & MINIG_SF_CREATE )
 	{
@@ -235,7 +212,7 @@ void ent_read_minigame()
 			minigame_read_owner();
 			float ent = ReadLong();
 			self.minigame_playerslot = ent;
-			LOG_DEBUG("Player: ",GetPlayerName(ent-1),"\n");
+			LOG_DEBUG("Player: ",entcs_GetName(ent-1),"\n");
 
 			activate = (ent == player_localnum+1 && self.owner && self.owner != active_minigame);
 
@@ -258,10 +235,11 @@ void ent_read_minigame()
 
 	if ( sf & MINIG_SF_CREATE )
 	{
-		LOG_DEBUG("CL Reading entity: ",ftos(num_for_edict(self)),
+		LOG_DEBUG("CL Reading entity: ",ftos(etof(self)),
 			" classname:",self.classname," enttype:",ftos(self.enttype) );
 		LOG_DEBUG(" sf:",ftos(sf)," netname:",self.netname,"\n\n");
 	}
+	return true;
 }
 #undef ReadString
 #undef FIELD