reHLDS/rehlds
2
0
Fork 0
mirror of https://github.com/rehlds/rehlds.git synced 2025-02-27 05:51:10 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #414 from dreamstalker/fixes20170321

Browse Source 
Add check for NULL edict.
This commit is contained in:
Lev 2017-03-21 01:24:57 +05:00 committed by GitHub
commit 7e05e65513
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rehlds/engine/host.cpp
View File

@ -520,11 +520,14 @@ void SV_DropClient_internal(client_t *cl, qboolean crash, const char *string)
cl->proxy = FALSE; cl->proxy = FALSE;
COM_ClearCustomizationList(&cl->customdata, FALSE); COM_ClearCustomizationList(&cl->customdata, FALSE);
#ifdef REHLDS_FIXES #ifdef REHLDS_FIXES
// Reset flags, leave FL_DORMANT used by CS if (cl->edict)
cl->edict->v.flags &= FL_DORMANT; {
// Since the edict doesn't get deleted, fix it so it doesn't interfere. // Reset flags, leave FL_DORMANT used by CS
cl->edict->v.takedamage = DAMAGE_NO; // don't attract autoaim cl->edict->v.flags &= FL_DORMANT;
cl->edict->v.solid = SOLID_NOT; // Since the edict doesn't get deleted, fix it so it doesn't interfere.
cl->edict->v.takedamage = DAMAGE_NO; // don't attract autoaim
cl->edict->v.solid = SOLID_NOT;
}
#endif // REHLDS_FIXES #endif // REHLDS_FIXES
cl->edict = NULL; cl->edict = NULL;
Q_memset(cl->userinfo, 0, sizeof(cl->userinfo)); Q_memset(cl->userinfo, 0, sizeof(cl->userinfo));