From 5b21d1381aee5dba8abb2eb929f1a41286cdc975 Mon Sep 17 00:00:00 2001 From: jeefo Date: Sun, 31 Jan 2016 16:59:47 +0300 Subject: [PATCH 1/2] Fixed crash on bot disconnect. Fixed debug-build RTC failures on HUD messages. Fixed compiling. --- cl_dll/cs_wpn/cs_baseentity.cpp | 2 +- cl_dll/hud/message.cpp | 2 ++ dlls/client.cpp | 4 ---- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/cl_dll/cs_wpn/cs_baseentity.cpp b/cl_dll/cs_wpn/cs_baseentity.cpp index 15af234..c0dfd47 100644 --- a/cl_dll/cs_wpn/cs_baseentity.cpp +++ b/cl_dll/cs_wpn/cs_baseentity.cpp @@ -227,7 +227,7 @@ void UTIL_ScreenShake(const Vector ¢er, 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; } diff --git a/cl_dll/hud/message.cpp b/cl_dll/hud/message.cpp index 90ed169..6c98f6a 100644 --- a/cl_dll/hud/message.cpp +++ b/cl_dll/hud/message.cpp @@ -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; diff --git a/dlls/client.cpp b/dlls/client.cpp index 18d7863..fd2f6f9 100644 --- a/dlls/client.cpp +++ b/dlls/client.cpp @@ -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; From 34b0b7f986b109efe5648b97b45d8d12dd3e3b8d Mon Sep 17 00:00:00 2001 From: jeefo Date: Sun, 31 Jan 2016 17:03:16 +0300 Subject: [PATCH 2/2] Update YaPB rev --- yapb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yapb b/yapb index 9613440..b458c51 160000 --- a/yapb +++ b/yapb @@ -1 +1 @@ -Subproject commit 9613440a2603e38bd40930c5ac6c448d9ab93c8f +Subproject commit b458c513781bd51272170ed93832da08ef278cb3