MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2025-01-27 14:17:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix gcc build errors & warnings

Browse Source
This commit is contained in:
Alexander 'z33ky' Hirsch 2021-11-07 22:53:28 +01:00
parent 8652b31ed1
commit e46dc3a2bd
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sp/src/game/client/convarproxy.cpp
View File

@ -10,8 +10,8 @@
//#pragma warning(disable: 4786) //#pragma warning(disable: 4786)
#include "convar.h" #include "convar.h"
#include "MaterialSystem/imaterialproxy.h" #include "materialsystem/imaterialproxy.h"
#include "materialsystem/IMaterialVar.h" #include "materialsystem/imaterialvar.h"
//#include "imaterialproxydict.h" //#include "imaterialproxydict.h"
// NOTE: This has to be the last file included! // NOTE: This has to be the last file included!

6
sp/src/game/server/mapbase/ai_grenade.h
View File

@ -324,12 +324,12 @@ void CAI_GrenadeUser<BASE_NPC>::InputThrowGrenadeGestureAtTarget( inputdata_t &i
#ifdef SHARED_COMBINE_ACTIVITIES #ifdef SHARED_COMBINE_ACTIVITIES
if (IsAltFireCapable()) if (IsAltFireCapable())
{ {
if (FVisible( m_hForcedGrenadeTarget )) if (this->FVisible( m_hForcedGrenadeTarget ))
{ {
m_vecAltFireTarget = vecTarget; m_vecAltFireTarget = vecTarget;
m_hForcedGrenadeTarget = NULL; m_hForcedGrenadeTarget = NULL;
int iLayer = AddGesture( ACT_GESTURE_COMBINE_AR2_ALTFIRE ); int iLayer = this->AddGesture( ACT_GESTURE_COMBINE_AR2_ALTFIRE );
if (iLayer != -1) if (iLayer != -1)
{ {
this->GetShotRegulator()->FireNoEarlierThan( gpGlobals->curtime + this->GetLayerDuration( iLayer ) ); this->GetShotRegulator()->FireNoEarlierThan( gpGlobals->curtime + this->GetLayerDuration( iLayer ) );
@ -342,7 +342,7 @@ void CAI_GrenadeUser<BASE_NPC>::InputThrowGrenadeGestureAtTarget( inputdata_t &i
// Ignore grenade count / distance / etc // Ignore grenade count / distance / etc
if (CheckCanThrowGrenade( vecTarget )) if (CheckCanThrowGrenade( vecTarget ))
{ {
int iLayer = AddGesture( ACT_GESTURE_COMBINE_THROW_GRENADE ); int iLayer = this->AddGesture( ACT_GESTURE_COMBINE_THROW_GRENADE );
if (iLayer != -1) if (iLayer != -1)
{ {
this->GetShotRegulator()->FireNoEarlierThan( gpGlobals->curtime + this->GetLayerDuration( iLayer ) ); this->GetShotRegulator()->FireNoEarlierThan( gpGlobals->curtime + this->GetLayerDuration( iLayer ) );

2
sp/src/game/server/props.cpp
View File

@ -44,7 +44,7 @@
#ifdef MAPBASE #ifdef MAPBASE
#include "mapbase/GlobalStrings.h" #include "mapbase/GlobalStrings.h"
#include "collisionutils.h" #include "collisionutils.h"
#include "vstdlib/ikeyvaluessystem.h" // From Alien Swarm SDK #include "vstdlib/IKeyValuesSystem.h" // From Alien Swarm SDK
#endif #endif
// memdbgon must be the last include file in a .cpp file!!! // memdbgon must be the last include file in a .cpp file!!!