Merge pull request #159 from z33ky/mb/gcc-fixes

Fix gcc build errors & warnings
mapbase-source · Nov 7, 2021 · 28c968a · 28c968a
2 parents 3a297d0 + e46dc3a
commit 28c968a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/sp/src/game/client/convarproxy.cpp b/sp/src/game/client/convarproxy.cpp
@@ -10,8 +10,8 @@
 //#pragma warning(disable: 4786)
 
 #include "convar.h"
-#include "MaterialSystem/imaterialproxy.h"
-#include "materialsystem/IMaterialVar.h"
+#include "materialsystem/imaterialproxy.h"
+#include "materialsystem/imaterialvar.h"
 //#include "imaterialproxydict.h"
 
 // NOTE: This has to be the last file included!

diff --git a/sp/src/game/server/mapbase/ai_grenade.h b/sp/src/game/server/mapbase/ai_grenade.h
@@ -324,12 +324,12 @@ void CAI_GrenadeUser<BASE_NPC>::InputThrowGrenadeGestureAtTarget( inputdata_t &i
 #ifdef SHARED_COMBINE_ACTIVITIES
 	if (IsAltFireCapable())
 	{
-		if (FVisible( m_hForcedGrenadeTarget ))
+		if (this->FVisible( m_hForcedGrenadeTarget ))
 		{
 			m_vecAltFireTarget = vecTarget;
 			m_hForcedGrenadeTarget = NULL;
 
-			int iLayer = AddGesture( ACT_GESTURE_COMBINE_AR2_ALTFIRE );
+			int iLayer = this->AddGesture( ACT_GESTURE_COMBINE_AR2_ALTFIRE );
 			if (iLayer != -1)
 			{
 				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
 		if (CheckCanThrowGrenade( vecTarget ))
 		{
-			int iLayer = AddGesture( ACT_GESTURE_COMBINE_THROW_GRENADE );
+			int iLayer = this->AddGesture( ACT_GESTURE_COMBINE_THROW_GRENADE );
 			if (iLayer != -1)
 			{
 				this->GetShotRegulator()->FireNoEarlierThan( gpGlobals->curtime + this->GetLayerDuration( iLayer ) );

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