X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cl_main.c;h=994fe164d2f326979a06ac8b33eb406e5ecdb4e8;hb=bba5486f1a7a3d9942fc6632b662003e300e7309;hp=a159d68490a0bc71038bf0632b7efc1296ab415d;hpb=fa0a170a56a980db7b518d0771a7f695f37a5391;p=xonotic%2Fdarkplaces.git

diff --git a/cl_main.c b/cl_main.c
index a159d684..994fe164 100644
--- a/cl_main.c
+++ b/cl_main.c
@@ -52,7 +52,7 @@ cvar_t m_side = {CVAR_SAVE, "m_side","0.8","mouse side speed multiplier"};
 cvar_t freelook = {CVAR_SAVE, "freelook", "1","mouse controls pitch instead of forward/back"};
 
 cvar_t cl_autodemo = {CVAR_SAVE, "cl_autodemo", "0", "records every game played, using the date/time and map name to name the demo file" };
-cvar_t cl_autodemo_nameformat = {CVAR_SAVE, "cl_autodemo_nameformat", "%Y-%m-%d_%H-%M", "The format of the cl_autodemo filename, followed by the map name" };
+cvar_t cl_autodemo_nameformat = {CVAR_SAVE, "cl_autodemo_nameformat", "autodemos/%Y-%m-%d_%H-%M", "The format of the cl_autodemo filename, followed by the map name" };
 
 cvar_t r_draweffects = {0, "r_draweffects", "1","renders temporary sprite effects"};
 
@@ -338,9 +338,9 @@ void CL_Disconnect(void)
 			Con_DPrint("Sending clc_disconnect\n");
 			MSG_WriteByte(&buf, clc_disconnect);
 		}
-		NetConn_SendUnreliableMessage(cls.netcon, &buf, cls.protocol);
-		NetConn_SendUnreliableMessage(cls.netcon, &buf, cls.protocol);
-		NetConn_SendUnreliableMessage(cls.netcon, &buf, cls.protocol);
+		NetConn_SendUnreliableMessage(cls.netcon, &buf, cls.protocol, 10000);
+		NetConn_SendUnreliableMessage(cls.netcon, &buf, cls.protocol, 10000);
+		NetConn_SendUnreliableMessage(cls.netcon, &buf, cls.protocol, 10000);
 		NetConn_Close(cls.netcon);
 		cls.netcon = NULL;
 	}
@@ -436,6 +436,24 @@ static void CL_PrintEntities_f(void)
 	}
 }
 
+/*
+===============
+CL_ModelIndexList_f
+
+List all models in the client modelindex
+===============
+*/
+static void CL_ModelIndexList_f(void)
+{
+	int nModelIndexCnt = 1;
+
+	while(cl.model_precache[nModelIndexCnt] && nModelIndexCnt != MAX_MODELS)
+	{ // Valid Model
+		Con_Printf("%i : %s\n", nModelIndexCnt, cl.model_precache[nModelIndexCnt]->name);
+		nModelIndexCnt++;
+	}
+}
+
 //static const vec3_t nomodelmins = {-16, -16, -16};
 //static const vec3_t nomodelmaxs = {16, 16, 16};
 void CL_UpdateRenderEntity(entity_render_t *ent)
@@ -503,7 +521,7 @@ static float CL_LerpPoint(void)
 {
 	float f;
 
-	if (cl_nettimesyncmode.integer == 3)
+	if (cl_nettimesyncboundmode.integer == 1)
 		cl.time = bound(cl.mtime[1], cl.time, cl.mtime[0]);
 
 	// LordHavoc: lerp in listen games as the server is being capped below the client (usually)
@@ -799,6 +817,7 @@ void CL_UpdateNetworkEntity(entity_t *e, int recursionlimit, qboolean interpolat
 	e->render.flags = e->state_current.flags;
 	e->render.effects = e->state_current.effects;
 	VectorScale(e->state_current.colormod, (1.0f / 32.0f), e->render.colormod);
+	e->render.entitynumber = e - cl.entities;
 	if (e->state_current.flags & RENDER_COLORMAPPED)
 	{
 		int cb;
@@ -926,17 +945,11 @@ void CL_UpdateNetworkEntity(entity_t *e, int recursionlimit, qboolean interpolat
 		e->render.model = cl.model_precache[e->state_current.modelindex];
 	if (e->render.model)
 	{
+		// models can set flags such as EF_ROCKET
+		e->render.effects |= e->render.model->effects;
 		// if model is alias or this is a tenebrae-like dlight, reverse pitch direction
 		if (e->render.model->type == mod_alias)
 			angles[0] = -angles[0];
-		if ((e->render.model->flags & EF_ROTATE) && (!e->state_current.tagentity && !(e->render.flags & RENDER_VIEWMODEL)))
-		{
-			angles[1] = ANGLEMOD(100*cl.time);
-			if (cl_itembobheight.value)
-				origin[2] += (cos(cl.time * cl_itembobspeed.value * (2.0 * M_PI)) + 1.0) * 0.5 * cl_itembobheight.value;
-		}
-		// transfer certain model flags to effects
-		e->render.effects |= e->render.model->flags2 & (EF_FULLBRIGHT | EF_ADDITIVE);
 		if ((e->render.effects & EF_SELECTABLE) && cl.cmd.cursor_entitynumber == e->state_current.number)
 			VectorScale(e->render.colormod, 2, e->render.colormod);
 	}
@@ -944,6 +957,13 @@ void CL_UpdateNetworkEntity(entity_t *e, int recursionlimit, qboolean interpolat
 	else if (e->state_current.lightpflags & PFLAGS_FULLDYNAMIC)
 		angles[0] = -angles[0];
 
+	if ((e->render.effects & EF_ROTATE) && !(e->render.flags & RENDER_VIEWMODEL))
+	{
+		angles[1] = ANGLEMOD(100*cl.time);
+		if (cl_itembobheight.value)
+			origin[2] += (cos(cl.time * cl_itembobspeed.value * (2.0 * M_PI)) + 1.0) * 0.5 * cl_itembobheight.value;
+	}
+
 	// animation lerp
 	if (e->render.frame2 == e->state_current.frame)
 	{
@@ -1003,6 +1023,8 @@ void CL_UpdateNetworkEntity(entity_t *e, int recursionlimit, qboolean interpolat
 	 && !(e->render.flags & RENDER_VIEWMODEL)
 	 && (!(e->render.flags & RENDER_EXTERIORMODEL) || (!cl.intermission && cls.protocol != PROTOCOL_NEHAHRAMOVIE && !cl_noplayershadow.integer)))
 		e->render.flags |= RENDER_SHADOW;
+	if (e->render.flags & RENDER_VIEWMODEL)
+		e->render.flags |= RENDER_NOSELFSHADOW;
 }
 
 // creates light and trails from an entity
@@ -1026,7 +1048,7 @@ void CL_UpdateNetworkEntityTrail(entity_t *e)
 	// entity is in the world...
 	trailtype = EFFECT_NONE;
 	// LordHavoc: if the entity has no effects, don't check each
-	if (e->render.effects & (EF_BRIGHTFIELD | EF_FLAME | EF_STARDUST | EF_FLAG1QW | EF_FLAG2QW))
+	if (e->render.effects & (EF_BRIGHTFIELD | EF_FLAME | EF_STARDUST))
 	{
 		if (e->render.effects & EF_BRIGHTFIELD)
 		{
@@ -1039,40 +1061,41 @@ void CL_UpdateNetworkEntityTrail(entity_t *e)
 			CL_ParticleTrail(EFFECT_EF_FLAME, bound(0, cl.time - cl.oldtime, 0.1), origin, origin, vec3_origin, vec3_origin, NULL, 0, false, true);
 		if (e->render.effects & EF_STARDUST)
 			CL_ParticleTrail(EFFECT_EF_STARDUST, bound(0, cl.time - cl.oldtime, 0.1), origin, origin, vec3_origin, vec3_origin, NULL, 0, false, true);
-		if (e->render.effects & (EF_FLAG1QW | EF_FLAG2QW))
-		{
-			// these are only set on player entities
-			CL_AddQWCTFFlagModel(e, (e->render.effects & EF_FLAG2QW) != 0);
-		}
+	}
+	if (e->render.internaleffects & (INTEF_FLAG1QW | INTEF_FLAG2QW))
+	{
+		// these are only set on player entities
+		CL_AddQWCTFFlagModel(e, (e->render.internaleffects & INTEF_FLAG2QW) != 0);
 	}
 	// muzzleflash fades over time
 	if (e->persistent.muzzleflash > 0)
 		e->persistent.muzzleflash -= bound(0, cl.time - cl.oldtime, 0.1) * 20;
-	// LordHavoc: if the model has no flags, don't check each
-	if (e->render.model && e->render.model->flags && (!e->state_current.tagentity && !(e->render.flags & RENDER_VIEWMODEL)))
+	// LordHavoc: if the entity has no effects, don't check each
+	if (e->render.model && e->render.effects && !(e->render.flags & RENDER_VIEWMODEL))
 	{
-		if (e->render.model->flags & EF_GIB)
+		if (e->render.effects & EF_GIB)
 			trailtype = EFFECT_TR_BLOOD;
-		else if (e->render.model->flags & EF_ZOMGIB)
+		else if (e->render.effects & EF_ZOMGIB)
 			trailtype = EFFECT_TR_SLIGHTBLOOD;
-		else if (e->render.model->flags & EF_TRACER)
+		else if (e->render.effects & EF_TRACER)
 			trailtype = EFFECT_TR_WIZSPIKE;
-		else if (e->render.model->flags & EF_TRACER2)
+		else if (e->render.effects & EF_TRACER2)
 			trailtype = EFFECT_TR_KNIGHTSPIKE;
-		else if (e->render.model->flags & EF_ROCKET)
+		else if (e->render.effects & EF_ROCKET)
 			trailtype = EFFECT_TR_ROCKET;
-		else if (e->render.model->flags & EF_GRENADE)
+		else if (e->render.effects & EF_GRENADE)
 		{
 			// LordHavoc: e->render.alpha == -1 is for Nehahra dem compatibility (cigar smoke)
 			trailtype = e->render.alpha == -1 ? EFFECT_TR_NEHAHRASMOKE : EFFECT_TR_GRENADE;
 		}
-		else if (e->render.model->flags & EF_TRACER3)
+		else if (e->render.effects & EF_TRACER3)
 			trailtype = EFFECT_TR_VORESPIKE;
 	}
 	// do trails
 	if (e->render.flags & RENDER_GLOWTRAIL)
 		trailtype = EFFECT_TR_GLOWTRAIL;
-	if (trailtype)
+	// check if a trail is allowed (it is not after a teleport for example)
+	if (trailtype && e->persistent.trail_allowed)
 	{
 		float len;
 		vec3_t vel;
@@ -1083,6 +1106,9 @@ void CL_UpdateNetworkEntityTrail(entity_t *e)
 		VectorScale(vel, len, vel);
 		CL_ParticleTrail(trailtype, 1, e->persistent.trail_origin, origin, vel, vel, e, e->state_current.glowcolor, false, true);
 	}
+	// now that the entity has survived one trail update it is allowed to
+	// leave a real trail on later frames
+	e->persistent.trail_allowed = true;
 	VectorCopy(origin, e->persistent.trail_origin);
 }
 
@@ -1187,7 +1213,7 @@ void CL_UpdateViewModel(void)
 			ent->state_current.modelindex = 0;
 	}
 	ent->state_current.alpha = cl.entities[cl.viewentity].state_current.alpha;
-	ent->state_current.effects = EF_NOSHADOW | (cl.entities[cl.viewentity].state_current.effects & (EF_ADDITIVE | EF_REFLECTIVE | EF_FULLBRIGHT | EF_NODEPTHTEST));
+	ent->state_current.effects = EF_NOSHADOW | (cl.entities[cl.viewentity].state_current.effects & (EF_ADDITIVE | EF_FULLBRIGHT | EF_NODEPTHTEST));
 
 	// reset animation interpolation on weaponmodel if model changed
 	if (ent->state_previous.modelindex != ent->state_current.modelindex)
@@ -1210,12 +1236,7 @@ void CL_LinkNetworkEntity(entity_t *e)
 	// skip inactive entities and world
 	if (!e->state_current.active || e == cl.entities)
 		return;
-	if (e->render.flags & RENDER_VIEWMODEL && !e->state_current.tagentity)
-	{
-		if (!r_drawviewmodel.integer || chase_active.integer || r_refdef.envmap)
-			return;
-	}
-	else
+	if (e->state_current.tagentity)
 	{
 		// if the tag entity is currently impossible, skip it
 		if (e->state_current.tagentity >= cl.num_entities)
@@ -1298,24 +1319,24 @@ void CL_LinkNetworkEntity(entity_t *e)
 		R_RTLight_Update(&r_refdef.lights[r_refdef.numlights++], false, &tempmatrix, color, -1, NULL, true, 0, 0.25, 0, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 	}
 	// LordHavoc: if the model has no flags, don't check each
-	if (e->render.model && e->render.model->flags && (!e->state_current.tagentity && !(e->render.flags & RENDER_VIEWMODEL)))
+	if (e->render.model && e->render.effects && !(e->render.flags & RENDER_VIEWMODEL))
 	{
-		if (e->render.model->flags & EF_GIB)
+		if (e->render.effects & EF_GIB)
 			trailtype = EFFECT_TR_BLOOD;
-		else if (e->render.model->flags & EF_ZOMGIB)
+		else if (e->render.effects & EF_ZOMGIB)
 			trailtype = EFFECT_TR_SLIGHTBLOOD;
-		else if (e->render.model->flags & EF_TRACER)
+		else if (e->render.effects & EF_TRACER)
 			trailtype = EFFECT_TR_WIZSPIKE;
-		else if (e->render.model->flags & EF_TRACER2)
+		else if (e->render.effects & EF_TRACER2)
 			trailtype = EFFECT_TR_KNIGHTSPIKE;
-		else if (e->render.model->flags & EF_ROCKET)
+		else if (e->render.effects & EF_ROCKET)
 			trailtype = EFFECT_TR_ROCKET;
-		else if (e->render.model->flags & EF_GRENADE)
+		else if (e->render.effects & EF_GRENADE)
 		{
 			// LordHavoc: e->render.alpha == -1 is for Nehahra dem compatibility (cigar smoke)
 			trailtype = e->render.alpha == -1 ? EFFECT_TR_NEHAHRASMOKE : EFFECT_TR_GRENADE;
 		}
-		else if (e->render.model->flags & EF_TRACER3)
+		else if (e->render.effects & EF_TRACER3)
 			trailtype = EFFECT_TR_VORESPIKE;
 	}
 	// LordHavoc: customizable glow
@@ -1359,6 +1380,10 @@ void CL_LinkNetworkEntity(entity_t *e)
 	if (trailtype)
 		CL_ParticleTrail(trailtype, 0, origin, origin, vec3_origin, vec3_origin, NULL, e->state_current.glowcolor, true, false);
 
+	// don't show viewmodels in certain situations
+	if (e->render.flags & RENDER_VIEWMODEL)
+		if (!r_drawviewmodel.integer || chase_active.integer || r_refdef.envmap)
+			return;
 	// don't show entities with no modelindex (note: this still shows
 	// entities which have a modelindex that resolved to a NULL model)
 	if (e->render.model && !(e->render.effects & EF_NODRAW) && r_refdef.numentities < r_refdef.maxentities)
@@ -1680,17 +1705,13 @@ void CSQC_RelinkAllEntities (int drawmask)
 
 /*
 ===============
-CL_ReadFromServer
+CL_UpdateWorld
 
-Read all incoming data from the server
+Update client game world for a new frame
 ===============
 */
-int CL_ReadFromServer(void)
+void CL_UpdateWorld(void)
 {
-	CL_ReadDemoMessage();
-	CL_SendMove();
-
-	r_refdef.time = cl.time;
 	r_refdef.extraupdate = !r_speeds.integer;
 	r_refdef.numentities = 0;
 	r_refdef.numlights = 0;
@@ -1733,13 +1754,9 @@ int CL_ReadFromServer(void)
 		// move particles
 		CL_MoveParticles();
 		R_MoveExplosions();
-
-		// update the r_refdef time again because cl.time may have changed in
-		// CL_LerpPoint()
-		r_refdef.time = cl.time;
 	}
 
-	return 0;
+	r_refdef.time = cl.time;
 }
 
 // LordHavoc: pausedemo command
@@ -1780,11 +1797,9 @@ For program optimization
 static void CL_TimeRefresh_f (void)
 {
 	int i;
-	float timestart, timedelta, oldangles[3];
+	float timestart, timedelta;
 
 	r_refdef.extraupdate = false;
-	VectorCopy(cl.viewangles, oldangles);
-	VectorClear(cl.viewangles);
 
 	timestart = Sys_DoubleTime();
 	for (i = 0;i < 128;i++)
@@ -1794,7 +1809,6 @@ static void CL_TimeRefresh_f (void)
 	}
 	timedelta = Sys_DoubleTime() - timestart;
 
-	VectorCopy(oldangles, cl.viewangles);
 	Con_Printf("%f seconds (%f fps)\n", timedelta, 128/timedelta);
 }
 
@@ -2186,6 +2200,9 @@ void CL_Init (void)
 	Cmd_AddCommand ("playdemo", CL_PlayDemo_f, "watch a demo file");
 	Cmd_AddCommand ("timedemo", CL_TimeDemo_f, "play back a demo as fast as possible and save statistics to benchmark.log");
 
+	// Support Client-side Model Index List
+	Cmd_AddCommand ("cl_modelindexlist", CL_ModelIndexList_f, "list all models in the client modelindex");
+
 	Cvar_RegisterVariable (&cl_autodemo);
 	Cvar_RegisterVariable (&cl_autodemo_nameformat);