kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow persistent spectating concrete player in multiplayer

Browse Source 
For spectatepersistent = 1 that is always enabled (that means, that
spectated player isn't changed after his death), for 0  - only in
non-arena modes, except of demos.
"if(!available.length()) return f;" is introduced, in order to, in arena
modes, doesn't happen switching to SM_FLY, when last alive players dies
in the same moment and there is no winner of the round.
This commit is contained in:
aurhat
2014-12-02 21:05:47 +01:00
parent 795fad52b6
commit bd50e67f65
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/clientgame.cpp
+4 -3
View File
@@ -1653,14 +1653,15 @@ void refreshsopmenu(void *menu, bool init)
}
extern bool watchingdemo;
VARP(spectatepersistent,0,1,1);
// rotate through all spec-able players
playerent *updatefollowplayer(int shiftdirection)
{
playerent *f = players.inrange(player1->followplayercn) ? players[player1->followplayercn] : NULL;
if(!shiftdirection)
{
playerent *f = players.inrange(player1->followplayercn) ? players[player1->followplayercn] : NULL;
if(f && (watchingdemo || !f->isspectating())) return f;
if(f && (watchingdemo || !f->isspectating() || spectatepersistent || (!spectatepersistent && !m_arena) )) return f;
}
// collect spec-able players
@@ -1671,7 +1672,7 @@ playerent *updatefollowplayer(int shiftdirection)
if(players[i]->state==CS_DEAD || players[i]->isspectating()) continue;
available.add(players[i]);
}
if(!available.length()) return NULL;
if(!available.length()) return f;
// rotate
int oldidx = -1;