]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Update spawnpoints on the client side when their team is changed via reset and activation
authorMario <mario.mario@y7mail.com>
Wed, 20 May 2020 08:55:16 +0000 (18:55 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 20 May 2020 08:55:16 +0000 (18:55 +1000)
qcsrc/server/spawnpoints.qc

index 5aa81a2a73b0e9ad3fae1304237f863e71c9a2ed..e2c5ab307aa7743dedc878cc89f0b2254f4ae8bc 100644 (file)
@@ -65,10 +65,16 @@ void spawnpoint_use(entity this, entity actor, entity trigger)
        {
                this.team = actor.team;
                some_spawn_has_been_used = true;
+               this.SendFlags |= 1; // update team on the client side
        }
        //LOG_INFO("spawnpoint was used!\n");
 }
 
+void spawnpoint_reset(entity this)
+{
+       this.SendFlags |= 1; // update team since it was restored during reset
+}
+
 void relocate_spawnpoint(entity this)
 {
     // nudge off the floor
@@ -106,6 +112,7 @@ void relocate_spawnpoint(entity this)
     this.use = spawnpoint_use;
     setthink(this, spawnpoint_think);
     this.nextthink = time + 0.5 + random() * 2; // shouldn't need it for a little second
+    this.reset2 = spawnpoint_reset; // restores team, allows re-sending the spawnpoint
     this.team_saved = this.team;
     IL_PUSH(g_saved_team, this);
     if (!this.cnt)