X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cl_main.c;h=2cae309c27914cd757fa6b658f288103d1c84bdf;hb=aa33d8f8642530f7f266d6cde1422f95aa74b2be;hp=e463e8efe26c2b829ac3c4944f4b213eb257bf8a;hpb=17fdc60aff5ea50886d4fd180ff00af11f7272d9;p=xonotic%2Fdarkplaces.git

diff --git a/cl_main.c b/cl_main.c
index e463e8ef..2cae309c 100644
--- a/cl_main.c
+++ b/cl_main.c
@@ -63,6 +63,13 @@ cvar_t cl_noplayershadow = {CVAR_SAVE, "cl_noplayershadow", "0"};
 
 cvar_t cl_prydoncursor = {0, "cl_prydoncursor", "0"};
 
+cvar_t cl_deathnoviewmodel = {0, "cl_deathnoviewmodel", "1"};
+
+vec3_t cl_playerstandmins;
+vec3_t cl_playerstandmaxs;
+vec3_t cl_playercrouchmins;
+vec3_t cl_playercrouchmaxs;
+
 mempool_t *cl_mempool;
 
 client_static_t	cls;
@@ -85,13 +92,17 @@ cl_effect_t *cl_effects;
 beam_t *cl_beams;
 dlight_t *cl_dlights;
 lightstyle_t *cl_lightstyle;
-entity_render_t **cl_brushmodel_entities;
+int *cl_brushmodel_entities;
 
 int cl_num_entities;
 int cl_num_static_entities;
 int cl_num_temp_entities;
 int cl_num_brushmodel_entities;
 
+// keep track of quake entities because they need to be killed if they get stale
+extern int cl_lastquakeentity;
+extern qbyte cl_isquakeentity[MAX_EDICTS];
+
 /*
 =====================
 CL_ClearState
@@ -140,15 +151,18 @@ void CL_ClearState(void)
 	cl_max_lightstyle = MAX_LIGHTSTYLES;
 	cl_max_brushmodel_entities = MAX_EDICTS;
 
-	cl_entities = Mem_Alloc(cl_mempool, cl_max_entities * sizeof(entity_t));
-	cl_entities_active = Mem_Alloc(cl_mempool, cl_max_brushmodel_entities * sizeof(qbyte));
-	cl_static_entities = Mem_Alloc(cl_mempool, cl_max_static_entities * sizeof(entity_t));
-	cl_temp_entities = Mem_Alloc(cl_mempool, cl_max_temp_entities * sizeof(entity_t));
-	cl_effects = Mem_Alloc(cl_mempool, cl_max_effects * sizeof(cl_effect_t));
-	cl_beams = Mem_Alloc(cl_mempool, cl_max_beams * sizeof(beam_t));
-	cl_dlights = Mem_Alloc(cl_mempool, cl_max_dlights * sizeof(dlight_t));
-	cl_lightstyle = Mem_Alloc(cl_mempool, cl_max_lightstyle * sizeof(lightstyle_t));
-	cl_brushmodel_entities = Mem_Alloc(cl_mempool, cl_max_brushmodel_entities * sizeof(entity_render_t *));
+	cl_entities = (entity_t *)Mem_Alloc(cl_mempool, cl_max_entities * sizeof(entity_t));
+	cl_entities_active = (qbyte *)Mem_Alloc(cl_mempool, cl_max_brushmodel_entities * sizeof(qbyte));
+	cl_static_entities = (entity_t *)Mem_Alloc(cl_mempool, cl_max_static_entities * sizeof(entity_t));
+	cl_temp_entities = (entity_t *)Mem_Alloc(cl_mempool, cl_max_temp_entities * sizeof(entity_t));
+	cl_effects = (cl_effect_t *)Mem_Alloc(cl_mempool, cl_max_effects * sizeof(cl_effect_t));
+	cl_beams = (beam_t *)Mem_Alloc(cl_mempool, cl_max_beams * sizeof(beam_t));
+	cl_dlights = (dlight_t *)Mem_Alloc(cl_mempool, cl_max_dlights * sizeof(dlight_t));
+	cl_lightstyle = (lightstyle_t *)Mem_Alloc(cl_mempool, cl_max_lightstyle * sizeof(lightstyle_t));
+	cl_brushmodel_entities = (int *)Mem_Alloc(cl_mempool, cl_max_brushmodel_entities * sizeof(int));
+
+	cl_lastquakeentity = 0;
+	memset(cl_isquakeentity, 0, sizeof(cl_isquakeentity));
 
 	// LordHavoc: have to set up the baseline info for alpha and other stuff
 	for (i = 0;i < cl_max_entities;i++)
@@ -158,6 +172,21 @@ void CL_ClearState(void)
 		cl_entities[i].state_current = defaultstate;
 	}
 
+	if (gamemode == GAME_NEXUIZ)
+	{
+		VectorSet(cl_playerstandmins, -16, -16, -24);
+		VectorSet(cl_playerstandmaxs, 16, 16, 45);
+		VectorSet(cl_playercrouchmins, -16, -16, -24);
+		VectorSet(cl_playercrouchmaxs, 16, 16, 25);
+	}
+	else
+	{
+		VectorSet(cl_playerstandmins, -16, -16, -24);
+		VectorSet(cl_playerstandmaxs, 16, 16, 24);
+		VectorSet(cl_playercrouchmins, -16, -16, -24);
+		VectorSet(cl_playercrouchmaxs, 16, 16, 24);
+	}
+
 	CL_Screen_NewMap();
 	CL_Particles_Clear();
 	CL_CGVM_Clear();
@@ -170,13 +199,13 @@ void CL_ExpandEntities(int num)
 	if (num >= cl_max_entities)
 	{
 		if (!cl_entities)
-			Host_Error("CL_ExpandEntities: cl_entities not initialized\n");
+			Sys_Error("CL_ExpandEntities: cl_entities not initialized\n");
 		if (num >= MAX_EDICTS)
 			Host_Error("CL_ExpandEntities: num %i >= %i\n", num, MAX_EDICTS);
 		oldmaxentities = cl_max_entities;
 		oldentities = cl_entities;
 		cl_max_entities = (num & ~255) + 256;
-		cl_entities = Mem_Alloc(cl_mempool, cl_max_entities * sizeof(entity_t));
+		cl_entities = (entity_t *)Mem_Alloc(cl_mempool, cl_max_entities * sizeof(entity_t));
 		memcpy(cl_entities, oldentities, oldmaxentities * sizeof(entity_t));
 		Mem_Free(oldentities);
 		for (i = oldmaxentities;i < cl_max_entities;i++)
@@ -311,9 +340,9 @@ static void CL_PrintEntities_f(void)
 			strlcpy (name, ent->render.model->name, 25);
 		else
 			strcpy(name, "--no model--");
-		for (j = strlen(name);j < 25;j++)
+		for (j = (int)strlen(name);j < 25;j++)
 			name[j] = ' ';
-		Con_Printf("%3i: %s:%04i (%5i %5i %5i) [%3i %3i %3i] %4.2f %5.3f\n", i, name, ent->render.frame, (int) ent->render.origin[0], (int) ent->render.origin[1], (int) ent->render.origin[2], (int) ent->render.angles[0] % 360, (int) ent->render.angles[1] % 360, (int) ent->render.angles[2] % 360, ent->render.scale, ent->render.alpha);
+		Con_Printf("%3i: %s:%4i (%5i %5i %5i) [%3i %3i %3i] %4.2f %5.3f\n", i, name, ent->render.frame, (int) ent->render.origin[0], (int) ent->render.origin[1], (int) ent->render.origin[2], (int) ent->render.angles[0] % 360, (int) ent->render.angles[1] % 360, (int) ent->render.angles[2] % 360, ent->render.scale, ent->render.alpha);
 	}
 }
 
@@ -543,9 +572,10 @@ void CL_LinkNetworkEntity(entity_t *e)
 	matrix4x4_t *matrix, blendmatrix, tempmatrix, matrix2;
 	//matrix4x4_t dlightmatrix;
 	int j, k, l, trailtype, temp;
-	float origin[3], angles[3], delta[3], lerp, dlightcolor[3], dlightradius, mins[3], maxs[3], v[3], v2[3], d;
+	float origin[3], angles[3], delta[3], lerp, dlightcolor[3], dlightradius, mins[3], maxs[3], v2[3], d;
 	entity_t *t;
 	model_t *model;
+	trace_t trace;
 	//entity_persistent_t *p = &e->persistent;
 	//entity_render_t *r = &e->render;
 	if (e->persistent.linkframe != entitylinkframenumber)
@@ -558,15 +588,47 @@ void CL_LinkNetworkEntity(entity_t *e)
 		e->render.scale = e->state_current.scale * (1.0f / 16.0f); // FIXME: interpolate?
 		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);
 		if (e->state_current.flags & RENDER_COLORMAPPED)
+		{
+			int cb;
+			qbyte *cbcolor;
 			e->render.colormap = e->state_current.colormap;
-		else if (cl.scores != NULL && e->state_current.colormap)
+			cb = (e->render.colormap & 0xF) << 4;cb += (cb >= 128 && cb < 224) ? 4 : 12;
+			cbcolor = (qbyte *) (&palette_complete[cb]);
+			e->render.colormap_pantscolor[0] = cbcolor[0] * (1.0f / 255.0f) * e->render.colormod[0];
+			e->render.colormap_pantscolor[1] = cbcolor[1] * (1.0f / 255.0f) * e->render.colormod[1];
+			e->render.colormap_pantscolor[2] = cbcolor[2] * (1.0f / 255.0f) * e->render.colormod[2];
+			cb = (e->render.colormap & 0xF0);cb += (cb >= 128 && cb < 224) ? 4 : 12;
+			cbcolor = (qbyte *) (&palette_complete[cb]);
+			e->render.colormap_shirtcolor[0] = cbcolor[0] * (1.0f / 255.0f) * e->render.colormod[0];
+			e->render.colormap_shirtcolor[1] = cbcolor[1] * (1.0f / 255.0f) * e->render.colormod[1];
+			e->render.colormap_shirtcolor[2] = cbcolor[2] * (1.0f / 255.0f) * e->render.colormod[2];
+		}
+		else if (e->state_current.colormap && cl.scores != NULL)
+		{
+			int cb;
+			qbyte *cbcolor;
 			e->render.colormap = cl.scores[e->state_current.colormap - 1].colors; // color it
+			cb = (e->render.colormap & 0xF) << 4;cb += (cb >= 128 && cb < 224) ? 4 : 12;
+			cbcolor = (qbyte *) (&palette_complete[cb]);
+			e->render.colormap_pantscolor[0] = cbcolor[0] * (1.0f / 255.0f) * e->render.colormod[0];
+			e->render.colormap_pantscolor[1] = cbcolor[1] * (1.0f / 255.0f) * e->render.colormod[1];
+			e->render.colormap_pantscolor[2] = cbcolor[2] * (1.0f / 255.0f) * e->render.colormod[2];
+			cb = (e->render.colormap & 0xF0);cb += (cb >= 128 && cb < 224) ? 4 : 12;
+			cbcolor = (qbyte *) (&palette_complete[cb]);
+			e->render.colormap_shirtcolor[0] = cbcolor[0] * (1.0f / 255.0f) * e->render.colormod[0];
+			e->render.colormap_shirtcolor[1] = cbcolor[1] * (1.0f / 255.0f) * e->render.colormod[1];
+			e->render.colormap_shirtcolor[2] = cbcolor[2] * (1.0f / 255.0f) * e->render.colormod[2];
+		}
 		else
+		{
 			e->render.colormap = -1; // no special coloring
+			VectorClear(e->render.colormap_pantscolor);
+			VectorClear(e->render.colormap_shirtcolor);
+		}
 		e->render.skinnum = e->state_current.skin;
-		VectorScale(e->state_current.colormod, (1.0f / 32.0f), e->render.colormod);
-		if (e->render.flags & RENDER_VIEWMODEL)
+		if (e->render.flags & RENDER_VIEWMODEL && !e->state_current.tagentity)
 		{
 			if (!r_drawviewmodel.integer || chase_active.integer || envmap)
 				return;
@@ -593,7 +655,7 @@ void CL_LinkNetworkEntity(entity_t *e)
 			// make relative to the entity
 			matrix = &t->render.matrix;
 			// some properties of the tag entity carry over
-			e->render.flags |= t->render.flags & RENDER_EXTERIORMODEL;
+			e->render.flags |= t->render.flags & (RENDER_EXTERIORMODEL | RENDER_VIEWMODEL);
 			// if a valid tagindex is used, make it relative to that tag instead
 			// FIXME: use a model function to get tag info (need to handle skeletal)
 			if (e->state_current.tagentity && e->state_current.tagindex >= 1 && (model = t->render.model))
@@ -617,7 +679,15 @@ void CL_LinkNetworkEntity(entity_t *e)
 		}
 
 		// movement lerp
-		if (e->persistent.lerpdeltatime > 0 && (lerp = (cl.time - e->persistent.lerpstarttime) / e->persistent.lerpdeltatime) < 1)
+		// if it's the player entity, update according to client movement
+		if (e == cl_entities + cl.playerentity && cl.movement)
+		{
+			lerp = (cl.time - cl.mtime[1]) / (cl.mtime[0] - cl.mtime[1]);
+			lerp = bound(0, lerp, 1);
+			VectorLerp(cl.movement_oldorigin, lerp, cl.movement_origin, origin);
+			VectorSet(angles, 0, cl.viewangles[1], 0);
+		}
+		else if (e->persistent.lerpdeltatime > 0 && (lerp = (cl.time - e->persistent.lerpstarttime) / e->persistent.lerpdeltatime) < 1)
 		{
 			// interpolate the origin and angles
 			VectorLerp(e->persistent.oldorigin, lerp, e->persistent.neworigin, origin);
@@ -650,7 +720,7 @@ void CL_LinkNetworkEntity(entity_t *e)
 			}
 			// transfer certain model flags to effects
 			e->render.effects |= e->render.model->flags2 & (EF_FULLBRIGHT | EF_ADDITIVE);
-			if (cl_prydoncursor.integer && (e->render.effects & EF_SELECTABLE) && cl.cmd.cursor_entitynumber == e - cl_entities)
+			if (cl_prydoncursor.integer && (e->render.effects & EF_SELECTABLE) && cl.cmd.cursor_entitynumber == e->state_current.number)
 				VectorScale(e->render.colormod, 2, e->render.colormod);
 		}
 
@@ -689,9 +759,19 @@ void CL_LinkNetworkEntity(entity_t *e)
 		CL_BoundingBoxForEntity(&e->render);
 
 		// handle effects now that we know where this entity is in the world...
-		origin[0] = e->render.matrix.m[0][3];
-		origin[1] = e->render.matrix.m[1][3];
-		origin[2] = e->render.matrix.m[2][3];
+		if (e->render.model && e->render.model->soundfromcenter)
+		{
+			// bmodels are treated specially since their origin is usually '0 0 0'
+			vec3_t o;
+			VectorMAM(0.5f, e->render.model->normalmins, 0.5f, e->render.model->normalmaxs, o);
+			Matrix4x4_Transform(&e->render.matrix, o, origin);
+		}
+		else
+		{
+			origin[0] = e->render.matrix.m[0][3];
+			origin[1] = e->render.matrix.m[1][3];
+			origin[2] = e->render.matrix.m[2][3];
+		}
 		trailtype = -1;
 		dlightradius = 0;
 		dlightcolor[0] = 0;
@@ -782,11 +862,11 @@ void CL_LinkNetworkEntity(entity_t *e)
 		if (e->persistent.muzzleflash > 0)
 		{
 			Matrix4x4_Transform(&e->render.matrix, muzzleflashorigin, v2);
-			CL_TraceLine(origin, v2, v, NULL, true, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_SKY);
+			trace = CL_TraceBox(origin, vec3_origin, vec3_origin, v2, true, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_SKY, false);
 			tempmatrix = e->render.matrix;
-			tempmatrix.m[0][3] = v[0];
-			tempmatrix.m[1][3] = v[1];
-			tempmatrix.m[2][3] = v[2];
+			tempmatrix.m[0][3] = trace.endpos[0];
+			tempmatrix.m[1][3] = trace.endpos[1];
+			tempmatrix.m[2][3] = trace.endpos[2];
 			CL_AllocDlight(NULL, &tempmatrix, 100, e->persistent.muzzleflash, e->persistent.muzzleflash, e->persistent.muzzleflash, 0, 0, 0, -1, true, 0, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 			e->persistent.muzzleflash -= cl.frametime * 10;
 		}
@@ -858,7 +938,7 @@ void CL_LinkNetworkEntity(entity_t *e)
 		{
 			//dlightmatrix = e->render.matrix;
 			// hack to make glowing player light shine on their gun
-			//if ((e - cl_entities) == cl.viewentity/* && !chase_active.integer*/)
+			//if (e->state_current.number == cl.viewentity/* && !chase_active.integer*/)
 			//	dlightmatrix.m[2][3] += 30;
 			CL_AllocDlight(&e->render, &e->render.matrix, dlightradius, dlightcolor[0], dlightcolor[1], dlightcolor[2], 0, 0, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 		}
@@ -885,7 +965,7 @@ void CL_LinkNetworkEntity(entity_t *e)
 		if (gamemode == GAME_TENEBRAE && e->render.model && e->render.model->type == mod_sprite)
 			e->render.effects |= EF_ADDITIVE;
 		// player model is only shown with chase_active on
-		if (e - cl_entities == cl.viewentity)
+		if (e->state_current.number == cl.viewentity)
 			e->render.flags |= RENDER_EXTERIORMODEL;
 		// transparent stuff can't be lit during the opaque stage
 		if (e->render.effects & (EF_ADDITIVE | EF_NODEPTHTEST) || e->render.alpha < 1)
@@ -899,15 +979,15 @@ void CL_LinkNetworkEntity(entity_t *e)
 		 && (!(e->render.flags & RENDER_EXTERIORMODEL) || (!cl.intermission && cl.protocol != PROTOCOL_NEHAHRAMOVIE && !cl_noplayershadow.integer)))
 			e->render.flags |= RENDER_SHADOW;
 		// as soon as player is known we can call V_CalcRefDef
-		if ((e - cl_entities) == cl.viewentity)
+		if (e->state_current.number == cl.viewentity)
 			V_CalcRefdef();
 		if (e->render.model && e->render.model->name[0] == '*' && e->render.model->TraceBox)
-			cl_brushmodel_entities[cl_num_brushmodel_entities++] = &e->render;
+			cl_brushmodel_entities[cl_num_brushmodel_entities++] = e->state_current.number;
 		// 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)
 			r_refdef.entities[r_refdef.numentities++] = &e->render;
-		//if (cl.viewentity && e - cl_entities == cl.viewentity)
+		//if (cl.viewentity && e->state_current.number == cl.viewentity)
 		//	Matrix4x4_Print(&e->render.matrix);
 	}
 }
@@ -915,7 +995,7 @@ void CL_LinkNetworkEntity(entity_t *e)
 void CL_RelinkWorld(void)
 {
 	entity_t *ent = &cl_entities[0];
-	cl_brushmodel_entities[cl_num_brushmodel_entities++] = &ent->render;
+	cl_brushmodel_entities[cl_num_brushmodel_entities++] = 0;
 	// FIXME: this should be done at load
 	Matrix4x4_CreateIdentity(&ent->render.matrix);
 	Matrix4x4_CreateIdentity(&ent->render.inversematrix);
@@ -971,7 +1051,7 @@ static void CL_RelinkNetworkEntities(void)
 	ent->state_current.modelindex = cl.stats[STAT_WEAPON];
 	ent->state_current.frame = cl.stats[STAT_WEAPONFRAME];
 	ent->state_current.flags = RENDER_VIEWMODEL;
-	if (cl.stats[STAT_HEALTH] <= 0 || cl.intermission)
+	if ((cl.stats[STAT_HEALTH] <= 0 && cl_deathnoviewmodel.integer) || cl.intermission)
 		ent->state_current.modelindex = 0;
 	else if (cl.stats[STAT_ITEMS] & IT_INVISIBILITY)
 	{
@@ -1208,6 +1288,7 @@ CL_ReadFromServer
 Read all incoming data from the server
 ===============
 */
+extern void CL_ClientMovement_Replay();
 int CL_ReadFromServer(void)
 {
 	CL_ReadDemoMessage();
@@ -1215,6 +1296,7 @@ int CL_ReadFromServer(void)
 	r_refdef.time = cl.time;
 	r_refdef.extraupdate = !r_speeds.integer;
 	r_refdef.numentities = 0;
+	Matrix4x4_CreateIdentity(&r_refdef.viewentitymatrix);
 	cl_num_brushmodel_entities = 0;
 
 	if (cls.state == ca_connected && cls.signon == SIGNONS)
@@ -1227,6 +1309,7 @@ int CL_ReadFromServer(void)
 		V_FadeViewFlashs();
 
 		// relink network entities (note: this sets up the view!)
+		CL_ClientMovement_Replay();
 		CL_RelinkNetworkEntities();
 
 		// move particles
@@ -1254,11 +1337,9 @@ int CL_ReadFromServer(void)
 CL_SendCmd
 =================
 */
+void CL_UpdatePrydonCursor(void);
 void CL_SendCmd(void)
 {
-	if (cls.signon == SIGNONS)
-		CL_SendMove();
-
 	if (cls.demoplayback)
 	{
 		SZ_Clear(&cls.message);
@@ -1361,10 +1442,10 @@ void CL_Init (void)
 	memset(&r_refdef, 0, sizeof(r_refdef));
 	// max entities sent to renderer per frame
 	r_refdef.maxentities = MAX_EDICTS + 256 + 512;
-	r_refdef.entities = Mem_Alloc(cl_mempool, sizeof(entity_render_t *) * r_refdef.maxentities);
+	r_refdef.entities = (entity_render_t **)Mem_Alloc(cl_mempool, sizeof(entity_render_t *) * r_refdef.maxentities);
 	// 256k drawqueue buffer
 	r_refdef.maxdrawqueuesize = 256 * 1024;
-	r_refdef.drawqueue = Mem_Alloc(cl_mempool, r_refdef.maxdrawqueuesize);
+	r_refdef.drawqueue = (qbyte *)Mem_Alloc(cl_mempool, r_refdef.maxdrawqueuesize);
 
 	cls.message.data = cls.message_buf;
 	cls.message.maxsize = sizeof(cls.message_buf);
@@ -1425,6 +1506,8 @@ void CL_Init (void)
 
 	Cvar_RegisterVariable(&cl_prydoncursor);
 
+	Cvar_RegisterVariable(&cl_deathnoviewmodel);
+
 	Cmd_AddCommand("timerefresh", CL_TimeRefresh_f);
 
 	CL_Parse_Init();