From: Mario <mario.mario@y7mail.com>
Date: Mon, 18 May 2020 13:57:45 +0000 (+1000)
Subject: Improve support for per-player counters by spawning an entity to store the player... 
X-Git-Tag: xonotic-v0.8.5~1065
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8a8f9aefe3bd864bd4d4bd22e6236daa11fea79d;p=xonotic%2Fxonotic-data.pk3dir.git

Improve support for per-player counters by spawning an entity to store the player's counter for that trigger
---

diff --git a/qcsrc/common/mapobjects/trigger/counter.qc b/qcsrc/common/mapobjects/trigger/counter.qc
index db255ebb7..44cbd9045 100644
--- a/qcsrc/common/mapobjects/trigger/counter.qc
+++ b/qcsrc/common/mapobjects/trigger/counter.qc
@@ -5,11 +5,26 @@ void counter_reset(entity this);
 void counter_use(entity this, entity actor, entity trigger)
 {
 	entity store = this;
-	if(this.spawnflags & COUNTER_PER_PLAYER) // FIXME: multiple counters in the map will not function correctly, and upon trigger reset the player won't be able to use it again!
+	if(this.spawnflags & COUNTER_PER_PLAYER)
 	{
 		if(!IS_PLAYER(actor))
 			return;
-		store = actor;
+		entity mycounter = NULL;
+		IL_EACH(g_counters, it.realowner == actor && it.owner == this,
+		{
+			mycounter = it;
+			break;
+		});
+		if(!mycounter)
+		{
+			mycounter = new_pure(counter);
+			IL_PUSH(g_counters, mycounter);
+			mycounter.owner = this;
+			mycounter.realowner = actor;
+			mycounter.reset = counter_reset; // NOTE: this may be useless as the player deletes their counters upon respawning
+			mycounter.counter_cnt = 0;
+		}
+		store = mycounter;
 	}
 
 	store.counter_cnt += 1;
@@ -27,8 +42,8 @@ void counter_use(entity this, entity actor, entity trigger)
 
 		if(this.respawntime)
 		{
-			setthink(this, counter_reset);
-			this.nextthink = time + this.respawntime;
+			setthink(store, counter_reset);
+			store.nextthink = time + this.respawntime;
 		}
 	}
 	else
diff --git a/qcsrc/common/mapobjects/trigger/counter.qh b/qcsrc/common/mapobjects/trigger/counter.qh
index d36bd0293..403a87a89 100644
--- a/qcsrc/common/mapobjects/trigger/counter.qh
+++ b/qcsrc/common/mapobjects/trigger/counter.qh
@@ -4,6 +4,9 @@
 spawnfunc(trigger_counter);
 
 .float counter_cnt;
+
+IntrusiveList g_counters;
+STATIC_INIT(g_counters) { g_counters = IL_NEW(); }
 #endif
 
 const int COUNTER_FIRE_AT_COUNT = BIT(2);
diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 79dca0076..cb26ccc1f 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -690,6 +690,10 @@ void PutPlayerInServer(entity this)
 		IL_REMOVE(g_swamped, this);
 	this.swampslug = NULL;
 	this.swamp_interval = 0;
+	IL_EACH(g_counters, it.realowner == this,
+	{
+		delete(it);
+	});
 	STAT(HUD, this) = HUD_NORMAL;
 
 	this.event_damage = PlayerDamage;
@@ -1233,6 +1237,11 @@ void ClientDisconnect(entity this)
 	if (this.chatbubbleentity) delete(this.chatbubbleentity);
 	if (this.killindicator) delete(this.killindicator);
 
+	IL_EACH(g_counters, it.realowner == this,
+	{
+		delete(it);
+	});
+
 	WaypointSprite_PlayerGone(this);
 
 	bot_relinkplayerlist();