X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fclient.qc;h=856783df0dedd28ebf0599cadb057a2fcb7ec28d;hb=723fe3aa08556fdde679753c0afde734853f34e5;hp=d7b9a7ae0e7d6305ef86a5994b2b3e09f2edef80;hpb=2d5f6090a4faee9716a9c149b9ac6927cc3bb9db;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc index d7b9a7ae0..856783df0 100644 --- a/qcsrc/server/client.qc +++ b/qcsrc/server/client.qc @@ -61,6 +61,8 @@ #include "../lib/warpzone/server.qh" +#include + STATIC_METHOD(Client, Add, void(Client this, int _team)) { ClientConnect(this); @@ -654,9 +656,11 @@ void PutPlayerInServer(entity this) PHYS_INPUT_BUTTON_ATCK(this) = PHYS_INPUT_BUTTON_JUMP(this) = PHYS_INPUT_BUTTON_ATCK2(this) = false; + // player was spectator if (CS(this).killcount == FRAGS_SPECTATOR) { PlayerScore_Clear(this); CS(this).killcount = 0; + CS(this).startplaytime = time; } for (int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) @@ -1756,6 +1760,8 @@ void SpectateCopy(entity this, entity spectatee) this.weapons = spectatee.weapons; this.vortex_charge = spectatee.vortex_charge; this.vortex_chargepool_ammo = spectatee.vortex_chargepool_ammo; + this.okvortex_charge = spectatee.okvortex_charge; + this.okvortex_chargepool_ammo = spectatee.okvortex_chargepool_ammo; this.hagar_load = spectatee.hagar_load; this.arc_heat_percent = spectatee.arc_heat_percent; this.minelayer_mines = spectatee.minelayer_mines;