From ce950693d6768138f0c2a354d3b23901df5df9f3 Mon Sep 17 00:00:00 2001
From: Mikhail Polkovnikov <pmkclnl@yandex.ru>
Date: Sat, 11 Apr 2020 08:54:44 +0300
Subject: [PATCH] some minor fixes (gcc-9.3 compiler errors)

---
 code/game/Q3_Interface.cpp    | 2 +-
 code/game/g_svcmds.cpp        | 2 +-
 codeJK2/cgame/FxScheduler.h   | 6 +++---
 codeJK2/game/Q3_Interface.cpp | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/game/Q3_Interface.cpp b/code/game/Q3_Interface.cpp
index bb1ecba73a..d9c0aebb0c 100644
--- a/code/game/Q3_Interface.cpp
+++ b/code/game/Q3_Interface.cpp
@@ -10684,7 +10684,7 @@ int		CQuake3GameInterface::GetString( int entID, const char *name, char **value
 	case SET_ANIM_BOTH:
 		*value = (char *) Q3_GetAnimBoth( ent );
 
-		if ( VALIDSTRING( value ) == false )
+		if ( VALIDSTRING( *value ) == false )
 			return false;
 
 		break;
diff --git a/code/game/g_svcmds.cpp b/code/game/g_svcmds.cpp
index 1464e99177..511201ffba 100644
--- a/code/game/g_svcmds.cpp
+++ b/code/game/g_svcmds.cpp
@@ -268,7 +268,7 @@ static void Svcmd_SaberColor_f()
 		color[bladeNum] = gi.argv(2+bladeNum);
 	}
 
-	if ( !VALIDSTRING( color ) || saberNum < 1 || saberNum > 2 )
+	if ( !VALIDSTRING( color[bladeNum] ) || saberNum < 1 || saberNum > 2 )
 	{
 		gi.Printf( "Usage:  saberColor <saberNum> <blade1 color> <blade2 color> ... <blade8 color> \n" );
 		gi.Printf( "valid saberNums:  1 or 2\n" );
diff --git a/codeJK2/cgame/FxScheduler.h b/codeJK2/cgame/FxScheduler.h
index 26bed86d9b..fb363b80b2 100644
--- a/codeJK2/cgame/FxScheduler.h
+++ b/codeJK2/cgame/FxScheduler.h
@@ -79,7 +79,7 @@ class CMediaHandles
 {
 private:
 
-	vector<int>	mMediaList;
+	std::vector<int>	mMediaList;
 
 public:
 
@@ -406,9 +406,9 @@ class CFxScheduler
 	};
 
 	// this makes looking up the index based on the string name much easier
-	typedef map<fxString_t, int>				TEffectID;
+	typedef std::map<fxString_t, int>				TEffectID;
 
-	typedef list<SScheduledEffect*>			TScheduledEffect;
+	typedef std::list<SScheduledEffect*>			TScheduledEffect;
 
 	// Effects
 	SEffectTemplate		mEffectTemplates[FX_MAX_EFFECTS];
diff --git a/codeJK2/game/Q3_Interface.cpp b/codeJK2/game/Q3_Interface.cpp
index 1809f24880..95415eed94 100644
--- a/codeJK2/game/Q3_Interface.cpp
+++ b/codeJK2/game/Q3_Interface.cpp
@@ -8613,7 +8613,7 @@ static int Q3_GetString( int entID, int type, const char *name, char **value )
 	case SET_ANIM_BOTH:
 		*value = (char *) Q3_GetAnimBoth( ent );
 
-		if ( VALIDSTRING( value ) == false )
+		if ( VALIDSTRING( *value ) == false )
 			return false;
 
 		break;