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

fix for crosshair not showing when spectating;

Browse Source 
fix for setfollowplayer 0 crashing the game in bot mode

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7251 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Cristian Vlasceanu
2013-02-22 20:30:26 +00:00
parent 351f4a96dc
commit 491fb73c2d
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/clientgame.cpp
+1 -1
View File
@@ -1669,7 +1669,7 @@ void spectate()
void setfollowplayer(int cn)
{
// silently ignores invalid player-cn value passed
if(players.inrange(cn))
if(players.inrange(cn) && players[cn])
{
if(!(m_teammode && !watchingdemo && team_base(players[cn]->team) != team_base(player1->team)))
{
source/src/renderhud.cpp
+2 -1
View File
@@ -864,7 +864,8 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat
if (targetplayer) strcpy(lastseen, targetplayer->name);
bool menu = menuvisible();
bool command = getcurcommand() ? true : false;
if((p->state==CS_ALIVE || p->state==CS_EDITING) && !p->weaponsel->reloading)
bool reloading = lastmillis < p->weaponsel->reloading + p->weaponsel->info.reloadtime;
if((p->state==CS_ALIVE || p->state==CS_EDITING) && !reloading)
{
bool drawteamwarning = crosshairteamsign && targetplayer && isteam(targetplayer->team, p->team) && targetplayer->state==CS_ALIVE;
p->weaponsel->renderaimhelp(drawteamwarning);