X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_client.qc;h=f08ef5f5385b7b9dad3eb90bd06a86efbbff21db;hb=99d95ef781c647f71b42ef28f3e09cb3dd662042;hp=c5acd3ebf8151dbdc349b9f5a62ea0033960d05f;hpb=140a4f6ce49232daabbb3b1f0310ffffac93b104;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index c5acd3ebf..f08ef5f53 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -398,8 +398,15 @@ Checks if the argument string can be a valid playermodel.
 Returns a valid one in doubt.
 =============
 */
-string FallbackPlayerModel = "models/player/marine.zym";
+string FallbackPlayerModel;
 string CheckPlayerModel(string plyermodel) {
+	if(FallbackPlayerModel != cvar_defstring("_cl_playermodel"))
+	{
+		// note: we cannot summon Don Strunzone here, some player may
+		// still have the model string set. In case anyone manages how
+		// to change a cvar default, we'll have a small leak here.
+		FallbackPlayerModel = strzone(cvar_defstring("_cl_playermodel"));
+	}
 	if(strlen(plyermodel) < 4)
 		return FallbackPlayerModel;
 	if( substring(plyermodel,0,14) != "models/player/")
@@ -932,6 +939,7 @@ void PutClientInServer (void)
 		self.nextthink = 0;
 		self.hook_time = 0;
 		self.dmg_team = 0;
+		self.ballistics_density = cvar("g_ballistics_density_player");
 
 		self.metertime = 0;
 
@@ -1055,9 +1063,18 @@ float ClientInit_SendEntity(entity to, float sf)
 {
 	WriteByte(MSG_ENTITY, ENT_CLIENT_INIT);
 	WriteByte(MSG_ENTITY, g_nexball_meter_period * 32);
-	WriteCoord(MSG_ENTITY, hook_shotorigin_x);
-	WriteCoord(MSG_ENTITY, hook_shotorigin_y);
-	WriteCoord(MSG_ENTITY, hook_shotorigin_z);
+	WriteInt24_t(MSG_ENTITY, compressShotOrigin(hook_shotorigin[0]));
+	WriteInt24_t(MSG_ENTITY, compressShotOrigin(hook_shotorigin[1]));
+	WriteInt24_t(MSG_ENTITY, compressShotOrigin(hook_shotorigin[2]));
+	WriteInt24_t(MSG_ENTITY, compressShotOrigin(hook_shotorigin[3]));
+	WriteInt24_t(MSG_ENTITY, compressShotOrigin(electro_shotorigin[0]));
+	WriteInt24_t(MSG_ENTITY, compressShotOrigin(electro_shotorigin[1]));
+	WriteInt24_t(MSG_ENTITY, compressShotOrigin(electro_shotorigin[2]));
+	WriteInt24_t(MSG_ENTITY, compressShotOrigin(electro_shotorigin[3]));
+	WriteInt24_t(MSG_ENTITY, compressShotOrigin(gauntlet_shotorigin[0]));
+	WriteInt24_t(MSG_ENTITY, compressShotOrigin(gauntlet_shotorigin[1]));
+	WriteInt24_t(MSG_ENTITY, compressShotOrigin(gauntlet_shotorigin[2]));
+	WriteInt24_t(MSG_ENTITY, compressShotOrigin(gauntlet_shotorigin[3]));
 	if(sv_foginterval && world.fog != "")
 		WriteString(MSG_ENTITY, world.fog);
 	else
@@ -1066,6 +1083,8 @@ float ClientInit_SendEntity(entity to, float sf)
 	WriteByte(MSG_ENTITY, self.cnt * 255.0); // g_balance_weaponswitchdelay
 	WriteCoord(MSG_ENTITY, self.bouncefactor); // g_balance_grenadelauncher_secondary_bouncefactor
 	WriteCoord(MSG_ENTITY, self.bouncestop); // g_balance_grenadelauncher_secondary_bouncestop
+	WriteByte(MSG_ENTITY, cvar("g_balance_nex_secondary")); // client has to know if it should zoom or not
+	WriteByte(MSG_ENTITY, cvar("g_balance_campingrifle_secondary")); // client has to know if it should zoom or not
 	return TRUE;
 }
 
@@ -1386,6 +1405,10 @@ void ClientConnect (void)
 
 	DecodeLevelParms();
 
+#ifdef WATERMARK
+	sprint(self, strcat("^4SVQC Build information: ", WATERMARK(), "\n"));
+#endif
+
 	self.classname = "player_joining";
 
 	self.flags = FL_CLIENT;
@@ -2514,9 +2537,9 @@ void PlayerPreThink (void)
 		if(self.cvar_g_xonoticversion)
 			if(time > self.version_nagtime)
 			{
-				if(strstr(self.cvar_g_xonoticversion, "svn", 0) < 0)
+				if(strstr(self.cvar_g_xonoticversion, "git", 0) < 0)
 				{
-					if(strstr(cvar_string("g_xonoticversion"), "svn", 0) >= 0)
+					if(strstr(cvar_string("g_xonoticversion"), "git", 0) >= 0)
 					{
 						dprint("^1NOTE^7 to ", self.netname, "^7 - the server is running ^3Xonotic ", cvar_string("g_xonoticversion"), " (beta)^7, you have ^3Xonotic ", self.cvar_g_xonoticversion, "^1\n");
 						sprint(self, strcat("\{1}^1NOTE: ^7the server is running ^3Xonotic ", cvar_string("g_xonoticversion"), " (beta)^7, you have ^3Xonotic ", self.cvar_g_xonoticversion, "^1\n"));
@@ -2587,7 +2610,23 @@ void PlayerPreThink (void)
 
 		if(frametime)
 		{
-			self.glowmod = colormapPaletteColor(self.clientcolors & 0x0F, TRUE) * 2;
+			if(self.health <= 0 && cvar("g_deathglow"))
+			{
+				if(self.glowmod_x > 0)
+					self.glowmod_x -= cvar("g_deathglow") * frametime;
+				else
+					self.glowmod_x = -1;
+				if(self.glowmod_y > 0)
+					self.glowmod_y -= cvar("g_deathglow") * frametime;
+				else
+					self.glowmod_y = -1;
+				if(self.glowmod_z > 0)
+					self.glowmod_z -= cvar("g_deathglow") * frametime;
+				else
+					self.glowmod_z = -1;
+			}
+			else
+				self.glowmod = colormapPaletteColor(self.clientcolors & 0x0F, TRUE) * 2;
 			player_powerups();
 		}
 
@@ -2647,7 +2686,6 @@ void PlayerPreThink (void)
 		FOR_EACH_PLAYER(other) if(self != other)
 		{
 			if(time > other.touchexplode_time)
-			if(other.classname == "player")
 			if(other.deadflag == DEAD_NO)
 			if not(IS_INDEPENDENT_PLAYER(other))
 			if(boxesoverlap(self.absmin, self.absmax, other.absmin, other.absmax))
@@ -2765,7 +2803,7 @@ void PlayerPreThink (void)
 	}
 
 	if(!zoomstate_set)
-		SetZoomState(self.BUTTON_ZOOM || (self.BUTTON_ATCK2 && self.weapon == WEP_NEX));
+		SetZoomState(self.BUTTON_ZOOM || (self.BUTTON_ATCK2 && self.weapon == WEP_NEX) || (self.BUTTON_ATCK2 && self.weapon == WEP_CAMPINGRIFLE && cvar("g_balance_campingrifle_secondary") == 0));
 
 	float oldspectatee_status;
 	oldspectatee_status = self.spectatee_status;