X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cl_parse.c;h=1f229fd6a51177b0af6a6083c4cba0f5373cb3b5;hb=380380c0c6231c1b63a3100f56cb291a9d1247f0;hp=b8bfb65eaa0bf2589de2ddff7da462d175975537;hpb=0f80ff51ff9f369233d17b3377d3a0d34b4c8e5a;p=xonotic%2Fdarkplaces.git

diff --git a/cl_parse.c b/cl_parse.c
index b8bfb65e..1f229fd6 100644
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -25,6 +25,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "csprogs.h"
 #include "libcurl.h"
 #include "utf8lib.h"
+#include "menu.h"
+#include "cl_video.h"
 
 const char *svc_strings[128] =
 {
@@ -165,7 +167,6 @@ cvar_t cl_worldname = {CVAR_READONLY, "cl_worldname", "", "name of current world
 cvar_t cl_worldnamenoextension = {CVAR_READONLY, "cl_worldnamenoextension", "", "name of current worldmodel without extension"};
 cvar_t cl_worldbasename = {CVAR_READONLY, "cl_worldbasename", "", "name of current worldmodel without maps/ prefix or extension"};
 
-cvar_t demo_nehahra = {0, "demo_nehahra", "0", "reads all quake demos as nehahra movie protocol"};
 cvar_t developer_networkentities = {0, "developer_networkentities", "0", "prints received entities, value is 0-4 (higher for more info)"};
 cvar_t cl_gameplayfix_soundsmovewithentities = {0, "cl_gameplayfix_soundsmovewithentities", "1", "causes sounds made by lifts, players, projectiles, and any other entities, to move with the entity, so for example a rocket noise follows the rocket rather than staying at the starting position"};
 cvar_t cl_sound_wizardhit = {0, "cl_sound_wizardhit", "wizard/hit.wav", "sound to play during TE_WIZSPIKE (empty cvar disables sound)"};
@@ -486,6 +487,9 @@ static void CL_SetupWorldModel(void)
 	// check memory integrity
 	Mem_CheckSentinelsGlobal();
 
+	// make menu know
+	MR_NewMap();
+
 	// load the csqc now
 	if (cl.loadcsqc)
 	{
@@ -1190,13 +1194,13 @@ void CL_BeginDownloads(qboolean aborteddownload)
 		// finished loading sounds
 	}
 
-	if(gamemode == GAME_NEXUIZ)
+	if(gamemode == GAME_NEXUIZ || gamemode == GAME_XONOTIC)
 		Cvar_SetValueQuick(&cl_serverextension_download, false);
-		// in Nexuiz, the built in download protocol is kinda broken (misses lots
+		// in Nexuiz/Xonotic, the built in download protocol is kinda broken (misses lots
 		// of dependencies) anyway, and can mess around with the game directory;
 		// until this is fixed, only support pk3 downloads via curl, and turn off
 		// individual file downloads other than for CSQC
-		// on the other end of the download protocol, GAME_NEXUIZ enforces writing
+		// on the other end of the download protocol, GAME_NEXUIZ/GAME_XONOTIC enforces writing
 		// to dlcache only
 		// idea: support download of pk3 files using this protocol later
 
@@ -1369,8 +1373,8 @@ void CL_StopDownload(int size, int crc)
 			// save to disk only if we don't already have it
 			// (this is mainly for playing back demos)
 			existingcrc = FS_CRCFile(cls.qw_downloadname, &existingsize);
-			if (existingsize || gamemode == GAME_NEXUIZ || !strcmp(cls.qw_downloadname, csqc_progname.string))
-				// let csprogs ALWAYS go to dlcache, to prevent "viral csprogs"; also, never put files outside dlcache for Nexuiz
+			if (existingsize || gamemode == GAME_NEXUIZ || gamemode == GAME_XONOTIC || !strcmp(cls.qw_downloadname, csqc_progname.string))
+				// let csprogs ALWAYS go to dlcache, to prevent "viral csprogs"; also, never put files outside dlcache for Nexuiz/Xonotic
 			{
 				if ((int)existingsize != size || existingcrc != crc)
 				{
@@ -1616,7 +1620,11 @@ void CL_ParseServerInfo (void)
 	protocolversion_t protocol;
 	int nummodels, numsounds;
 
+	// if we start loading a level and a video is still playing, stop it
+	CL_VideoStop();
+
 	Con_DPrint("Serverinfo packet received.\n");
+	Collision_Cache_Reset(true);
 
 	// if server is active, we already began a loading plaque
 	if (!sv.active)
@@ -1647,7 +1655,7 @@ void CL_ParseServerInfo (void)
 		return;
 	}
 	// hack for unmarked Nehahra movie demos which had a custom protocol
-	if (protocol == PROTOCOL_QUAKEDP && cls.demoplayback && demo_nehahra.integer)
+	if (protocol == PROTOCOL_QUAKEDP && cls.demoplayback && gamemode == GAME_NEHAHRA)
 		protocol = PROTOCOL_NEHAHRAMOVIE;
 	cls.protocol = protocol;
 	Con_DPrintf("Server protocol is %s\n", Protocol_NameForEnum(cls.protocol));
@@ -1905,11 +1913,14 @@ void CL_ValidateState(entity_state_t *s)
 	if (!(s->flags & RENDER_COLORMAPPED) && s->colormap > cl.maxclients)
 		Con_DPrintf("CL_ValidateState: colormap (%i) > cl.maxclients (%i)\n", s->colormap, cl.maxclients);
 
-	model = CL_GetModelByIndex(s->modelindex);
-	if (model && model->type && s->frame >= model->numframes)
-		Con_DPrintf("CL_ValidateState: no such frame %i in \"%s\" (which has %i frames)\n", s->frame, model->name, model->numframes);
-	if (model && model->type && s->skin > 0 && s->skin >= model->numskins && !(s->lightpflags & PFLAGS_FULLDYNAMIC))
-		Con_DPrintf("CL_ValidateState: no such skin %i in \"%s\" (which has %i skins)\n", s->skin, model->name, model->numskins);
+	if (developer_extra.integer)
+	{
+		model = CL_GetModelByIndex(s->modelindex);
+		if (model && model->type && s->frame >= model->numframes)
+			Con_DPrintf("CL_ValidateState: no such frame %i in \"%s\" (which has %i frames)\n", s->frame, model->name, model->numframes);
+		if (model && model->type && s->skin > 0 && s->skin >= model->numskins && !(s->lightpflags & PFLAGS_FULLDYNAMIC))
+			Con_DPrintf("CL_ValidateState: no such skin %i in \"%s\" (which has %i skins)\n", s->skin, model->name, model->numskins);
+	}
 }
 
 void CL_MoveLerpEntityStates(entity_t *ent)
@@ -2012,6 +2023,16 @@ void CL_MoveLerpEntityStates(entity_t *ent)
 	// trigger muzzleflash effect if necessary
 	if (ent->state_current.effects & EF_MUZZLEFLASH)
 		ent->persistent.muzzleflash = 1;
+
+	// restart animation bit
+	if ((ent->state_previous.effects & EF_RESTARTANIM_BIT) != (ent->state_current.effects & EF_RESTARTANIM_BIT))
+	{
+		ent->render.framegroupblend[1] = ent->render.framegroupblend[0];
+		ent->render.framegroupblend[1].lerp = 1;
+		ent->render.framegroupblend[0].frame = ent->state_current.frame;
+		ent->render.framegroupblend[0].start = cl.time;
+		ent->render.framegroupblend[0].lerp = 0;
+	}
 }
 
 /*
@@ -3765,7 +3786,7 @@ void CL_ParseServerMessage(void)
 				if (protocol == PROTOCOL_UNKNOWN)
 					Host_Error("CL_ParseServerMessage: Server is unrecognized protocol number (%i)", i);
 				// hack for unmarked Nehahra movie demos which had a custom protocol
-				if (protocol == PROTOCOL_QUAKEDP && cls.demoplayback && demo_nehahra.integer)
+				if (protocol == PROTOCOL_QUAKEDP && cls.demoplayback && gamemode == GAME_NEHAHRA)
 					protocol = PROTOCOL_NEHAHRAMOVIE;
 				cls.protocol = protocol;
 				break;
@@ -4075,7 +4096,7 @@ void CL_ParseServerMessage(void)
 					MSG_ReadCoord(cls.protocol);
 					MSG_ReadCoord(cls.protocol);
 					MSG_ReadCoord(cls.protocol);
-					MSG_ReadByte();
+					(void) MSG_ReadByte();
 					MSG_ReadLong();
 					MSG_ReadLong();
 					MSG_ReadString();
@@ -4090,7 +4111,7 @@ void CL_ParseServerMessage(void)
 					MSG_ReadCoord(cls.protocol);
 					MSG_ReadCoord(cls.protocol);
 					MSG_ReadCoord(cls.protocol);
-					MSG_ReadByte();
+					(void) MSG_ReadByte();
 					MSG_ReadString();
 				}
 				else
@@ -4176,10 +4197,6 @@ void CL_Parse_Init(void)
 	Cvar_RegisterVariable(&cl_worldnamenoextension);
 	Cvar_RegisterVariable(&cl_worldbasename);
 
-	// LordHavoc: added demo_nehahra cvar
-	Cvar_RegisterVariable (&demo_nehahra);
-	if (gamemode == GAME_NEHAHRA)
-		Cvar_SetValue("demo_nehahra", 1);
 	Cvar_RegisterVariable(&developer_networkentities);
 	Cvar_RegisterVariable(&cl_gameplayfix_soundsmovewithentities);