X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fclient.qc;h=61b0c779ab7f4fa861f9f926f71e7af5eb0d2f96;hb=cc2bf5e8ece2d38fb412b7461ebdacd3ffdc567c;hp=0c48324254d567bc20c2ede64e6f1df0544bca3c;hpb=87db1635a8541571c00f913bc951031b08140391;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 0c4832425..61b0c779a 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -23,10 +23,12 @@
 #include "bot/api.qh"
 
 #include "../common/ent_cs.qh"
+#include "../common/wepent.qh"
 #include <common/state.qh>
 
 #include <common/effects/qc/globalsound.qh>
 
+#include "../common/triggers/func/conveyor.qh"
 #include "../common/triggers/teleporters.qh"
 
 #include "../common/vehicles/all.qh"
@@ -255,7 +257,7 @@ void PutObserverInServer(entity this)
         this.view_ofs = '0 0 0';
     }
 
-    RemoveGrapplingHook(this);
+    RemoveGrapplingHooks(this);
 	Portal_ClearAll(this);
 	Unfreeze(this);
 	SetSpectatee(this, NULL);
@@ -295,6 +297,8 @@ void PutObserverInServer(entity this)
 	accuracy_resend(this);
 
 	this.spectatortime = time;
+	if(this.bot_attack)
+		IL_REMOVE(g_bot_targets, this);
 	this.bot_attack = false;
     this.hud = HUD_NORMAL;
 	TRANSMUTE(Observer, this);
@@ -330,7 +334,6 @@ void PutObserverInServer(entity this)
 	this.istypefrag = 0;
 	setthink(this, func_null);
 	this.nextthink = 0;
-	this.hook_time = 0;
 	this.deadflag = DEAD_NO;
 	this.crouch = false;
 	this.revival_time = 0;
@@ -339,10 +342,11 @@ void PutObserverInServer(entity this)
 	this.weapons = '0 0 0';
 	this.drawonlytoclient = this;
 
-	this.weaponname = "";
 	this.weaponmodel = "";
 	for (int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
 	{
+		this.weaponentities[slot].hook_time = 0;
+		this.weaponentities[slot].weaponname = "";
 		this.weaponentities[slot] = NULL;
 	}
 	this.exteriorweaponentity = NULL;
@@ -631,11 +635,15 @@ void PutClientInServer(entity this)
 		this.oldorigin = this.origin;
 		this.prevorigin = this.origin;
 		this.lastteleporttime = time; // prevent insane speeds due to changing origin
+		if(this.conveyor)
+			IL_REMOVE(g_conveyed, this);
 		this.conveyor = NULL; // prevent conveyors at the previous location from moving a freshly spawned player
 		this.hud = HUD_NORMAL;
 
 		this.event_damage = PlayerDamage;
 
+		if(!this.bot_attack)
+			IL_PUSH(g_bot_targets, this);
 		this.bot_attack = true;
 		this.monster_attack = true;
 
@@ -684,11 +692,17 @@ void PutClientInServer(entity this)
 			delete(spot); // usefull for checking if there are spawnpoints, that let drop through the floor
 		}
 
-		PS(this).m_switchweapon = w_getbestweapon(this);
-		this.cnt = -1; // W_LastWeapon will not complain
-		PS(this).m_weapon = WEP_Null;
-		this.weaponname = "";
-		PS(this).m_switchingweapon = WEP_Null;
+		for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+		{
+			.entity weaponentity = weaponentities[slot];
+			if(slot == 0)
+				this.(weaponentity).m_switchweapon = w_getbestweapon(this);
+			else
+				this.(weaponentity).m_switchweapon = WEP_Null;
+			this.(weaponentity).weaponname = "";
+			this.(weaponentity).m_switchingweapon = WEP_Null;
+			this.(weaponentity).cnt = -1;
+		}
 
 		if (!warmup_stage && !this.alivetime)
 			this.alivetime = time;
@@ -938,10 +952,8 @@ void ClientKill_TeamChange (entity this, float targetteam) // 0 = don't change,
 			this.killindicator.count = bound(0, ceil(killtime), 10);
 			//sprint(this, strcat("^1You'll be dead in ", ftos(this.killindicator.cnt), " seconds\n"));
 
-			FOREACH_ENTITY_ENT(enemy, this,
+			IL_EACH(g_clones, it.enemy == this && !(it.effects & CSQCMODEL_EF_RESPAWNGHOST),
 			{
-				if(it.classname != "body")
-					continue;
 				it.killindicator = spawn();
 				it.killindicator.owner = it;
 				it.killindicator.scale = 0.5;
@@ -1137,7 +1149,10 @@ void ClientConnect(entity this)
 
 	this.netname_previous = strzone(this.netname);
 
-	Send_Notification(NOTIF_ALL, NULL, MSG_INFO, ((teamplay && IS_PLAYER(this)) ? APP_TEAM_ENT(this, INFO_JOIN_CONNECT_TEAM) : INFO_JOIN_CONNECT), this.netname);
+	if(teamplay && IS_PLAYER(this))
+		Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(this.team, INFO_JOIN_CONNECT_TEAM), this.netname);
+	else
+		Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_JOIN_CONNECT, this.netname);
 
 	stuffcmd(this, clientstuff, "\n");
 	stuffcmd(this, "cl_particles_reloadeffects\n"); // TODO do we still need this?
@@ -1200,7 +1215,7 @@ void ClientConnect(entity this)
 	if (IS_REAL_CLIENT(this))
 		sv_notice_join(this);
 
-	FOREACH_ENTITY_FLOAT(init_for_player_needed, true, {
+	IL_EACH(g_initforplayer, it.init_for_player, {
 		it.init_for_player(it, this);
 	});
 
@@ -1239,7 +1254,7 @@ void ClientDisconnect(entity this)
 
 	Unfreeze(this);
 
-	RemoveGrapplingHook(this);
+	RemoveGrapplingHooks(this);
 
 	// Here, everything has been done that requires this player to be a client.
 
@@ -1861,36 +1876,34 @@ void ShowRespawnCountdown(entity this)
 	}
 }
 
-void LeaveSpectatorMode(entity this)
+.bool team_selected;
+bool ShowTeamSelection(entity this)
 {
-	if(nJoinAllowed(this, this))
-	{
-		if(!teamplay || autocvar_g_campaign || autocvar_g_balance_teams || (this.wasplayer && autocvar_g_changeteam_banned) || this.team_forced > 0)
-		{
-			TRANSMUTE(Player, this);
-
-			SetSpectatee(this, NULL);
+	if(!teamplay || autocvar_g_campaign || autocvar_g_balance_teams || this.team_selected || (this.wasplayer && autocvar_g_changeteam_banned) || this.team_forced > 0)
+		return false;
+	stuffcmd(this, "menu_showteamselect\n");
+	return true;
+}
+void Join(entity this)
+{
+	TRANSMUTE(Player, this);
 
-			if(autocvar_g_campaign || autocvar_g_balance_teams)
-				{ JoinBestTeam(this, false, true); }
+	if(!this.team_selected)
+	if(autocvar_g_campaign || autocvar_g_balance_teams)
+		JoinBestTeam(this, false, true);
 
-			if(autocvar_g_campaign)
-				{ campaign_bots_may_start = true; }
+	if(autocvar_g_campaign)
+		campaign_bots_may_start = true;
 
-			Kill_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CPID_PREVENT_JOIN);
+	Kill_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CPID_PREVENT_JOIN);
 
-			PutClientInServer(this);
+	PutClientInServer(this);
 
-			if(IS_PLAYER(this)) { Send_Notification(NOTIF_ALL, NULL, MSG_INFO, ((teamplay && this.team != -1) ? APP_TEAM_ENT(this, INFO_JOIN_PLAY_TEAM) : INFO_JOIN_PLAY), this.netname); }
-		}
-		else
-			stuffcmd(this, "menu_showteamselect\n");
-	}
+	if(teamplay && this.team != -1)
+		Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(this.team, INFO_JOIN_PLAY_TEAM), this.netname);
 	else
-	{
-		// Player may not join because g_maxplayers is set
-		Send_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CENTER_JOIN_PREVENT);
-	}
+		Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_JOIN_PLAY, this.netname);
+	this.team_selected = false;
 }
 
 /**
@@ -1899,20 +1912,20 @@ void LeaveSpectatorMode(entity this)
  * it checks whether the number of currently playing players exceeds g_maxplayers.
  * @return int number of free slots for players, 0 if none
  */
-bool nJoinAllowed(entity this, entity ignore)
+int nJoinAllowed(entity this, entity ignore)
 {
 	if(!ignore)
 	// this is called that way when checking if anyone may be able to join (to build qcstatus)
 	// so report 0 free slots if restricted
 	{
 		if(autocvar_g_forced_team_otherwise == "spectate")
-			return false;
+			return 0;
 		if(autocvar_g_forced_team_otherwise == "spectator")
-			return false;
+			return 0;
 	}
 
-	if(this.team_forced < 0)
-		return false; // forced spectators can never join
+	if(this && this.team_forced < 0)
+		return 0; // forced spectators can never join
 
 	// TODO simplify this
 	int totalClients = 0;
@@ -1925,13 +1938,20 @@ bool nJoinAllowed(entity this, entity ignore)
 			++currentlyPlaying;
 	));
 
+	float free_slots = 0;
 	if (!autocvar_g_maxplayers)
-		return maxclients - totalClients;
+		free_slots = maxclients - totalClients;
+	else if(currentlyPlaying < autocvar_g_maxplayers)
+		free_slots = min(maxclients - totalClients, autocvar_g_maxplayers - currentlyPlaying);
 
-	if(currentlyPlaying < autocvar_g_maxplayers)
-		return min(maxclients - totalClients, autocvar_g_maxplayers - currentlyPlaying);
+	static float join_prevent_msg_time = 0;
+	if(this && ignore && !free_slots && time > join_prevent_msg_time)
+	{
+		Send_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CENTER_JOIN_PREVENT);
+		join_prevent_msg_time = time + 3;
+	}
 
-	return false;
+	return free_slots;
 }
 
 /**
@@ -1998,6 +2018,16 @@ void PrintWelcomeMessage(entity this)
 	}
 }
 
+bool joinAllowed(entity this)
+{
+	if (this.version_mismatch) return false;
+	if (!nJoinAllowed(this, this)) return false;
+	if (teamplay && lockteams) return false;
+	if (ShowTeamSelection(this)) return false;
+	if (MUTATOR_CALLHOOK(ForbidSpawn, this)) return false;
+	return true;
+}
+
 void ObserverThink(entity this)
 {
 	if ( this.impulse )
@@ -2007,7 +2037,7 @@ void ObserverThink(entity this)
 	}
 
 	if (this.flags & FL_JUMPRELEASED) {
-		if (PHYS_INPUT_BUTTON_JUMP(this) && !this.version_mismatch && !MUTATOR_CALLHOOK(ForbidSpawn, this)) {
+		if (PHYS_INPUT_BUTTON_JUMP(this) && joinAllowed(this)) {
 			this.flags &= ~FL_JUMPRELEASED;
 			this.flags |= FL_SPAWNING;
 		} else if(PHYS_INPUT_BUTTON_ATCK(this) && !this.version_mismatch) {
@@ -2025,7 +2055,7 @@ void ObserverThink(entity this)
 			if(this.flags & FL_SPAWNING)
 			{
 				this.flags &= ~FL_SPAWNING;
-				LeaveSpectatorMode(this);
+				Join(this);
 				return;
 			}
 		}
@@ -2048,7 +2078,7 @@ void SpectatorThink(entity this)
 	}
 
 	if (this.flags & FL_JUMPRELEASED) {
-		if (PHYS_INPUT_BUTTON_JUMP(this) && !this.version_mismatch && !MUTATOR_CALLHOOK(ForbidSpawn, this)) {
+		if (PHYS_INPUT_BUTTON_JUMP(this) && joinAllowed(this)) {
 			this.flags &= ~FL_JUMPRELEASED;
 			this.flags |= FL_SPAWNING;
 		} else if(PHYS_INPUT_BUTTON_ATCK(this) || this.impulse == 10 || this.impulse == 15 || this.impulse == 18 || (this.impulse >= 200 && this.impulse <= 209)) {
@@ -2083,7 +2113,7 @@ void SpectatorThink(entity this)
 			if(this.flags & FL_SPAWNING)
 			{
 				this.flags &= ~FL_SPAWNING;
-				LeaveSpectatorMode(this);
+				Join(this);
 				return;
 			}
 		}
@@ -2310,7 +2340,7 @@ void PlayerPreThink (entity this)
 					{
 						if ((this.respawn_flags & RESPAWN_FORCE) && !(this.respawn_time < this.respawn_time_max))
 							this.deadflag = DEAD_RESPAWNING;
-						else if (!button_pressed || (this.respawn_flags & RESPAWN_FORCE))
+						else if (!button_pressed || (time >= this.respawn_time_max && (this.respawn_flags & RESPAWN_FORCE)))
 							this.deadflag = DEAD_DEAD;
 						break;
 					}
@@ -2398,13 +2428,11 @@ void PlayerPreThink (entity this)
 		{
 			this.items &= ~this.items_added;
 
-			//for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
-			//{
-				//.entity weaponentity = weaponentities[slot];
-				//W_WeaponFrame(this, weaponentity);
-			//}
-			.entity weaponentity = weaponentities[0]; // TODO
-			W_WeaponFrame(this, weaponentity);
+			for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+			{
+				.entity weaponentity = weaponentities[slot];
+				W_WeaponFrame(this, weaponentity);
+			}
 
 			this.items_added = 0;
 			if (this.items & ITEM_Jetpack.m_itemid && (this.items & ITEM_JetpackRegen.m_itemid || this.ammo_fuel >= 0.01))
@@ -2417,8 +2445,12 @@ void PlayerPreThink (entity this)
 
 		// WEAPONTODO: Add a weapon request for this
 		// rot vortex charge to the charge limit
-		if (WEP_CVAR(vortex, charge_rot_rate) && this.vortex_charge > WEP_CVAR(vortex, charge_limit) && this.vortex_charge_rottime < time)
-			this.vortex_charge = bound(WEP_CVAR(vortex, charge_limit), this.vortex_charge - WEP_CVAR(vortex, charge_rot_rate) * frametime / W_TICSPERFRAME, 1);
+		for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+		{
+			.entity weaponentity = weaponentities[slot];
+			if (WEP_CVAR(vortex, charge_rot_rate) && this.(weaponentity).vortex_charge > WEP_CVAR(vortex, charge_limit) && this.(weaponentity).vortex_charge_rottime < time)
+				this.(weaponentity).vortex_charge = bound(WEP_CVAR(vortex, charge_limit), this.(weaponentity).vortex_charge - WEP_CVAR(vortex, charge_rot_rate) * frametime / W_TICSPERFRAME, 1);
+		}
 
 		if (frametime) player_anim(this);
 
@@ -2442,11 +2474,12 @@ void PlayerPreThink (entity this)
 	}
 
 	// WEAPONTODO: Add weapon request for this
+	.entity weaponentity = weaponentities[0]; // TODO: unhardcode
 	if (!zoomstate_set) {
 		SetZoomState(this,
 			PHYS_INPUT_BUTTON_ZOOM(this) || PHYS_INPUT_BUTTON_ZOOMSCRIPT(this)
-			|| (PHYS_INPUT_BUTTON_ATCK2(this) && PS(this).m_weapon == WEP_VORTEX)
-			|| (PHYS_INPUT_BUTTON_ATCK2(this) && PS(this).m_weapon == WEP_RIFLE && WEP_CVAR(rifle, secondary) == 0)
+			|| (PHYS_INPUT_BUTTON_ATCK2(this) && this.(weaponentity).m_weapon == WEP_VORTEX)
+			|| (PHYS_INPUT_BUTTON_ATCK2(this) && this.(weaponentity).m_weapon == WEP_RIFLE && WEP_CVAR(rifle, secondary) == 0)
 		);
     }
 
@@ -2470,7 +2503,7 @@ void PlayerPreThink (entity this)
 
 	// WEAPONTODO: Move into weaponsystem somehow
 	// if a player goes unarmed after holding a loaded weapon, empty his clip size and remove the crosshair ammo ring
-	if (PS(this).m_weapon == WEP_Null)
+	if (this.(weaponentity).m_weapon == WEP_Null)
 		this.clip_load = this.clip_size = 0;
 }