X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_client.qc;h=0f53264255eca962e6fbb86dc02a9cb608f4a25c;hb=e7f2a704da9e9230be32250b326dd7a19f14eb2d;hp=475771fd3a23e86c174b5a2592a0122b0babe8f8;hpb=8f1900cecab47b015eeac137dd7f542164862adc;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 475771fd3..0f5326425 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -2,15 +2,8 @@ void race_send_recordtime(float msg);
 void race_SendRankings(float pos, float prevpos, float del, float msg);
 
 void send_CSQC_teamnagger() {
-	WriteByte(0, SVC_TEMPENTITY);
-	WriteByte(0, TE_CSQC_TEAMNAGGER);
-}
-
-void send_CSQC_cr_maxbullets(entity e) {
-	msg_entity = e;
-	WriteByte(MSG_ONE, SVC_TEMPENTITY);
-	WriteByte(MSG_ONE, TE_CSQC_CR_MAXBULLETS);
-	WriteByte(MSG_ONE, autocvar_g_balance_campingrifle_magazinecapacity);
+	WriteByte(MSG_BROADCAST, SVC_TEMPENTITY);
+	WriteByte(MSG_BROADCAST, TE_CSQC_TEAMNAGGER);
 }
 
 void Announce(string snd) {
@@ -724,15 +717,6 @@ void PutObserverInServer (void)
 		self.frags = FRAGS_SPECTATOR;
 }
 
-float RestrictSkin(float s)
-{
-	if(!teams_matter)
-		return s;
-	if(s == 6)
-		return 6;
-	return mod(s, 3);
-}
-
 void FixPlayermodel()
 {
 	local string defaultmodel;
@@ -794,7 +778,7 @@ void FixPlayermodel()
 		}
 
 		oldskin = self.skinindex;
-		self.skinindex = RestrictSkin(stof(self.playerskin));
+		self.skinindex = stof(self.playerskin);
 	}
 
 	if(chmdl || oldskin != self.skinindex)
@@ -905,6 +889,23 @@ void PutClientInServer (void)
 			self.nex_charge = autocvar_g_balance_nex_charge_start;
 		}
 
+		// all weapons must be fully loaded the first time we pick them up, so set their load to maximum at respawn
+		self.laser_load = autocvar_g_balance_laser_reload_ammo;
+		self.shotgun_load = autocvar_g_balance_shotgun_reload_ammo;
+		self.sniperrifle_load = autocvar_g_balance_sniperrifle_reload_ammo;
+		self.uzi_load = autocvar_g_balance_uzi_reload_ammo;
+		self.grenadelauncher_load = autocvar_g_balance_grenadelauncher_reload_ammo;
+		self.minelayer_load = autocvar_g_balance_minelayer_reload_ammo;
+		self.electro_load = autocvar_g_balance_electro_reload_ammo;
+		self.crylink_load = autocvar_g_balance_crylink_reload_ammo;
+		self.hlac_load = autocvar_g_balance_hlac_reload_ammo;
+		self.fireball_load = autocvar_g_balance_fireball_reload_ammo;
+		self.seeker_load = autocvar_g_balance_fireball_reload_ammo;
+		self.minstanex_load = autocvar_g_balance_minstanex_reload_ammo;
+		self.nex_load = autocvar_g_balance_nex_reload_ammo;
+		self.hagar_load = autocvar_g_balance_hagar_reload_ammo;
+		self.rocketlauncher_load = autocvar_g_balance_rocketlauncher_reload_ammo;
+
 		if(inWarmupStage)
 		{
 			self.ammo_shells = warmup_start_ammo_shells;
@@ -1121,8 +1122,9 @@ float ClientInit_SendEntity(entity to, float sf)
 	WriteCoord(MSG_ENTITY, self.ebouncefactor); // g_balance_grenadelauncher_bouncefactor
 	WriteCoord(MSG_ENTITY, self.ebouncestop); // g_balance_grenadelauncher_bouncestop
 	WriteByte(MSG_ENTITY, autocvar_g_balance_nex_secondary); // client has to know if it should zoom or not
-	WriteByte(MSG_ENTITY, autocvar_g_balance_campingrifle_secondary); // client has to know if it should zoom or not
+	WriteByte(MSG_ENTITY, autocvar_g_balance_sniperrifle_secondary); // client has to know if it should zoom or not
 	WriteByte(MSG_ENTITY, serverflags); // client has to know if it should zoom or not
+	WriteCoord(MSG_ENTITY, autocvar_g_trueaim_minrange);
 	return TRUE;
 }
 
@@ -1343,7 +1345,7 @@ void ClientKill_TeamChange (float targetteam) // 0 = don't change, -1 = auto, -2
 			self.killindicator.nextthink = time + (self.lip) * 0.05;
 			self.killindicator.cnt = ceil(killtime);
 			self.killindicator.count = bound(0, ceil(killtime), 10);
-			sprint(self, strcat("^1You'll be dead in ", ftos(self.killindicator.cnt), " seconds\n"));
+			//sprint(self, strcat("^1You'll be dead in ", ftos(self.killindicator.cnt), " seconds\n"));
 
 			for(e = world; (e = find(e, classname, "body")) != world; )
 			{
@@ -1380,7 +1382,7 @@ void ClientKill (void)
 	{
 		// do nothing
 	}
-    else if(g_freezetag && self.freezetag_frozen == 1)
+    else if(self.freezetag_frozen)
     {
         // do nothing
     }
@@ -1750,8 +1752,6 @@ void ClientConnect (void)
 	else if(autocvar_sv_teamnagger && !(autocvar_bot_vs_human && (c3==-1 && c4==-1)) && !g_ca) // teamnagger is currently bad for ca
 		send_CSQC_teamnagger();
 
-	send_CSQC_cr_maxbullets(self);
-
 	CheatInitClient();
 
 	PlayerStats_AddPlayer(self);
@@ -2057,7 +2057,7 @@ void player_powerups (void)
 		self.modelflags &~= MF_ROCKET;
 	}
 
-	self.effects &~= (EF_RED | EF_BLUE | EF_ADDITIVE | EF_FULLBRIGHT | EF_FLAME | EF_NODEPTHTEST);
+	self.effects &~= (EF_DIMLIGHT | EF_RED | EF_BLUE | EF_ADDITIVE | EF_FULLBRIGHT | EF_FLAME | EF_NODEPTHTEST);
 
 	if(!self.modelindex || self.deadflag) // don't apply the flags if the player is gibbed
 		return;
@@ -2910,7 +2910,7 @@ void PlayerPreThink (void)
 	}
 
 	if(!zoomstate_set)
-		SetZoomState(self.BUTTON_ZOOM || (self.BUTTON_ATCK2 && self.weapon == WEP_NEX) || (self.BUTTON_ATCK2 && self.weapon == WEP_CAMPINGRIFLE && autocvar_g_balance_campingrifle_secondary == 0));
+		SetZoomState(self.BUTTON_ZOOM || (self.BUTTON_ATCK2 && self.weapon == WEP_NEX) || (self.BUTTON_ATCK2 && self.weapon == WEP_SNIPERRIFLE && autocvar_g_balance_sniperrifle_secondary == 0));
 
 	float oldspectatee_status;
 	oldspectatee_status = self.spectatee_status;