Merge pull request #97 from jeefo/master

Crashes on bot disconnect fixed.
This commit is contained in:
Alibek Omarov 2016-02-01 12:03:57 +06:00
commit 1cfe709023
4 changed files with 4 additions and 6 deletions

View File

@ -228,7 +228,7 @@ void UTIL_ScreenShake(const Vector &center, float amplitude, float frequency, fl
void UTIL_Bubbles(Vector mins, Vector maxs, int count) { }
void RemoveEntityHashValue(entvars_s *pev, const char *value, hash_types_e fieldType) { }
void AddEntityHashValue(entvars_s *pev, const char *value, hash_types_e fieldType) { }
int UTIL_PointContents(const Vector &vec) { }
int UTIL_PointContents(const Vector &vec) { return 0; }
void UTIL_EmitAmbientSound(edict_t *entity, const Vector &vecOrigin, const char *samp, float vol, float attenuation, int fFlags, int pitch) { }
CGrenade *CGrenade::ShootSatchelCharge(entvars_t *pevOwner, Vector vecStart, Vector vecVelocity) { return 0; }

View File

@ -143,6 +143,8 @@ void CHudMessage::MessageScanNextChar( void )
int srcRed, srcGreen, srcBlue, destRed, destGreen, destBlue;
int blend;
srcRed = srcGreen = srcBlue = destRed = destGreen = destBlue = blend = 0;
srcRed = m_parms.pMessage->r1;
srcGreen = m_parms.pMessage->g1;
srcBlue = m_parms.pMessage->b1;

View File

@ -93,10 +93,6 @@ void ClientDisconnect(edict_t *pEntity)
UTIL_SetOrigin(&pEntity->v, pEntity->v.origin);
g_pGameRules->ClientDisconnected(pEntity);
if (pPlayer->IsBot())
{
}
}
BOOL g_skipCareerInitialSpawn;

2
yapb

@ -1 +1 @@
Subproject commit 9613440a2603e38bd40930c5ac6c448d9ab93c8f
Subproject commit b458c513781bd51272170ed93832da08ef278cb3