Skip to content

some minor fixes (gcc-9.3 compiler errors) #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MichaelColonel wants to merge 1 commit into
base: custom
Choose a base branch
from
Open

some minor fixes (gcc-9.3 compiler errors) #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/Q3_Interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion code/game/g_svcmds.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" );
Expand Down
6 changes: 3 additions & 3 deletions codeJK2/cgame/FxScheduler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class CMediaHandles
{
private:

vector<int> mMediaList;
std::vector<int> mMediaList;

public:

Expand Down Expand Up @@ -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];
Expand Down
2 changes: 1 addition & 1 deletion codeJK2/game/Q3_Interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down