ioquake/jedi-academy
0
0
Fork 0
mirror of https://github.com/ioquake/jedi-academy.git synced 2024-11-22 04:11:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

stricmp -> Q_stricmp

Browse source
This commit is contained in:
Jonathan Gray 2013-04-25 15:31:31 +10:00
parent e5e1251df8
commit 901d5acb51
42 changed files with 223 additions and 232 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
codemp/RMG/RM_InstanceFile.cpp
View file

@ -149,30 +149,30 @@ CRMInstance* CRMInstanceFile::CreateInstance ( const char* name )
for ( group = mInstances; group; group = group->GetNext ( ) )
{
// Skip it if the name doesnt match
if ( stricmp ( name, group->FindPairValue ( "name", "" ) ) )
if ( Q_stricmp ( name, group->FindPairValue ( "name", "" ) ) )
{
continue;
}
// Handle the various forms of instance types
if ( !stricmp ( group->GetName ( ), "bsp" ) )
if ( !Q_stricmp ( group->GetName ( ), "bsp" ) )
{
instance = new CRMBSPInstance ( group, *this );
}
else if ( !stricmp ( group->GetName ( ), "npc" ) )
else if ( !Q_stricmp ( group->GetName ( ), "npc" ) )
{
// instance = new CRMNPCInstance ( group, *this );
continue;
}
else if ( !stricmp ( group->GetName ( ), "group" ) )
else if ( !Q_stricmp ( group->GetName ( ), "group" ) )
{
instance = new CRMGroupInstance ( group, *this );
}
else if ( !stricmp ( group->GetName ( ), "random" ) )
else if ( !Q_stricmp ( group->GetName ( ), "random" ) )
{
instance = new CRMRandomInstance ( group, *this );
}
else if ( !stricmp ( group->GetName ( ), "void" ) )
else if ( !Q_stricmp ( group->GetName ( ), "void" ) )
{
instance = new CRMVoidInstance ( group, *this );
}

2
codemp/RMG/RM_Instance_Group.cpp
View file

@ -61,7 +61,7 @@ CRMGroupInstance::CRMGroupInstance ( CGPGroup *instGroup, CRMInstanceFile& instF
float maxrange;
// Make sure only instances are specified as sub groups
assert ( 0 == stricmp ( instGroup->GetName ( ), "instance" ) );
assert ( 0 == Q_stricmp ( instGroup->GetName ( ), "instance" ) );
// Grab the name
name = instGroup->FindPairValue ( "name", "" );

2
codemp/RMG/RM_Instance_Random.cpp
View file

@ -39,7 +39,7 @@ CRMRandomInstance::CRMRandomInstance ( CGPGroup *instGroup, CRMInstanceFile& ins
group = group->GetNext ( ) )
{
// If this isnt an instance group then skip it
if ( stricmp ( group->GetName ( ), "instance" ) )
if ( Q_stricmp ( group->GetName ( ), "instance" ) )
{
continue;
}

2
codemp/RMG/RM_Manager.cpp
View file

@ -152,7 +152,7 @@ bool CRMManager::LoadMission ( qboolean IsServer )
if(Com_ParseTextFile(va("ext_data/rmg/%s.teams", temp), parser))
{
root = parser.GetBaseParseGroup()->GetSubGroups();
if (0 == stricmp(root->GetName(), "teams"))
if (0 == Q_stricmp(root->GetName(), "teams"))
{
/*
SV_SetConfigstring( CS_GAMETYPE_REDTEAM, root->FindPairValue ( "red", "marine" ));

10
codemp/RMG/RM_Mission.cpp
View file

@ -132,7 +132,7 @@ CRMObjective* CRMMission::FindObjective ( const char* name )
for (it = mObjectives.begin(); it != mObjectives.end(); it++)
{
// Does it match?
if (!stricmp ((*it)->GetName(), name ))
if (!Q_stricmp ((*it)->GetName(), name ))
{
return (*it);
}
@ -741,8 +741,8 @@ bool CRMMission::ParseInstancesOnPath ( CGPGroup* group )
for ( defenseGroup = group->GetSubGroups();
defenseGroup;
defenseGroup=defenseGroup->GetNext() )
if (stricmp ( defenseGroup->GetName ( ), "defenses" )==0 ||
stricmp ( defenseGroup->GetName(), "instanceonpath")==0)
if (Q_stricmp ( defenseGroup->GetName ( ), "defenses" )==0 ||
Q_stricmp ( defenseGroup->GetName(), "instanceonpath")==0)
{
const char* defName = defenseGroup->FindPairValue ( "instance", "" );
if ( *defName )
@ -1200,7 +1200,7 @@ CGPGroup* CRMMission::ParseRandom ( CGPGroup* randomGroup )
group;
group = group->GetNext ( ) )
{
if ( stricmp ( group->GetName ( ), "random_choice" ) )
if ( Q_stricmp ( group->GetName ( ), "random_choice" ) )
{
continue;
}
@ -1377,7 +1377,7 @@ bool CRMMission::Load ( const char* mission, const char* instances, const char*
// Grab the root parser groop and make sure its mission, otherwise this
// isnt a valid mission file
root = parser.GetBaseParseGroup()->GetSubGroups();
if(stricmp(root->GetName(), "mission"))
if(Q_stricmp(root->GetName(), "mission"))
{
Com_Printf("ERROR: '%s' is not a valid mission file\n", mission );
parser.Clean();

2
codemp/RMG/RM_Objective.cpp
View file

@ -87,7 +87,7 @@ CRMObjective::CRMObjective ( CGPGroup* group )
}
// If the objective names dont match then ignore this trigger
if ( stricmp ( trigger->GetObjectiveName ( ), GetTrigger() ) )
if ( Q_stricmp ( trigger->GetObjectiveName ( ), GetTrigger() ) )
{
continue;
}

4
codemp/RMG/RM_Path.cpp
View file

@ -97,7 +97,7 @@ void CRMPathManager::CreateLocation ( const char* name, const int min_depth, int
}
for (i = mLocations.size()-1; i>=0; --i)
if ( !stricmp ( name, mLocations[i]->GetName ( ) ) )
if ( !Q_stricmp ( name, mLocations[i]->GetName ( ) ) )
{
mLocations[i]->SetMinDepth(min_depth);
mLocations[i]->SetMaxDepth(max_depth);
@ -451,7 +451,7 @@ CRMNode* CRMPathManager::FindNodeByName ( const char* name )
for ( j = mNodes.size() - 1; j >=0; j-- )
{
if ( !stricmp ( name, mNodes[j]->GetName ( ) ) )
if ( !Q_stricmp ( name, mNodes[j]->GetName ( ) ) )
return mNodes[j];
}
return NULL;

12
codemp/RMG/RM_Terrain.cpp
View file

@ -85,7 +85,7 @@ void CRMLandScape::LoadMiscentDef(const char *td)
items = classes->GetSubGroups();
while(items)
{
if(!stricmp(items->GetName(), "miscent"))
if(!Q_stricmp(items->GetName(), "miscent"))
{
int height, maxheight;
@ -96,7 +96,7 @@ void CRMLandScape::LoadMiscentDef(const char *td)
model = items->GetSubGroups();
while(model)
{
if(!stricmp(model->GetName(), "model"))
if(!Q_stricmp(model->GetName(), "model"))
{
CRandomModel hd;
@ -109,19 +109,19 @@ void CRMLandScape::LoadMiscentDef(const char *td)
pair = model->GetPairs();
while(pair)
{
if(!stricmp(pair->GetName(), "name"))
if(!Q_stricmp(pair->GetName(), "name"))
{
hd.SetModel(pair->GetTopValue());
}
else if(!stricmp(pair->GetName(), "frequency"))
else if(!Q_stricmp(pair->GetName(), "frequency"))
{
hd.SetFrequency((float)atof(pair->GetTopValue()));
}
else if(!stricmp(pair->GetName(), "minscale"))
else if(!Q_stricmp(pair->GetName(), "minscale"))
{
hd.SetMinScale((float)atof(pair->GetTopValue()));
}
else if(!stricmp(pair->GetName(), "maxscale"))
else if(!Q_stricmp(pair->GetName(), "maxscale"))
{
hd.SetMaxScale((float)atof(pair->GetTopValue()));
}

10
codemp/Ratl/ratl_common.h
View file

@ -225,19 +225,19 @@ namespace str
}
inline int icmp(const char *s1,const char *s2)
{
return stricmp(s1,s2);
return Q_stricmp(s1,s2);
}
inline int cmpi(const char *s1,const char *s2)
{
return stricmp(s1,s2);
return Q_stricmp(s1,s2);
}
inline bool ieql(const char *s1,const char *s2)
{
return !stricmp(s1,s2);
return !Q_stricmp(s1,s2);
}
inline bool eqli(const char *s1,const char *s2)
{
return !stricmp(s1,s2);
return !Q_stricmp(s1,s2);
}
inline char *tok(char *s,const char *gap)
@ -1177,4 +1177,4 @@ public:
};
}
#endif
#endif

16
codemp/cgame/cg_draw.c
View file

@ -6588,35 +6588,35 @@ static void CG_DrawVote(void) {
else if (strncmp(cgs.voteString, "g_gametype", 10)==0)
{
trap_SP_GetStringTextString("MENUS_GAME_TYPE", sCmd, sizeof(sCmd) );
if ( stricmp("Free For All", cgs.voteString+11)==0 )
if ( Q_stricmp("Free For All", cgs.voteString+11)==0 )
{
sParm = CG_GetStringEdString("MENUS", "FREE_FOR_ALL");
}
else if ( stricmp("Duel", cgs.voteString+11)==0 )
else if ( Q_stricmp("Duel", cgs.voteString+11)==0 )
{
sParm = CG_GetStringEdString("MENUS", "DUEL");
}
else if ( stricmp("Holocron FFA", cgs.voteString+11)==0 )
else if ( Q_stricmp("Holocron FFA", cgs.voteString+11)==0 )
{
sParm = CG_GetStringEdString("MENUS", "HOLOCRON_FFA");
}
else if ( stricmp("Power Duel", cgs.voteString+11)==0 )
else if ( Q_stricmp("Power Duel", cgs.voteString+11)==0 )
{
sParm = CG_GetStringEdString("MENUS", "POWERDUEL");
}
else if ( stricmp("Team FFA", cgs.voteString+11)==0 )
else if ( Q_stricmp("Team FFA", cgs.voteString+11)==0 )
{
sParm = CG_GetStringEdString("MENUS", "TEAM_FFA");
}
else if ( stricmp("Siege", cgs.voteString+11)==0 )
else if ( Q_stricmp("Siege", cgs.voteString+11)==0 )
{
sParm = CG_GetStringEdString("MENUS", "SIEGE");
}
else if ( stricmp("Capture the Flag", cgs.voteString+11)==0 )
else if ( Q_stricmp("Capture the Flag", cgs.voteString+11)==0 )
{
sParm = CG_GetStringEdString("MENUS", "CAPTURE_THE_FLAG");
}
else if ( stricmp("Capture the Ysalamiri", cgs.voteString+11)==0 )
else if ( Q_stricmp("Capture the Ysalamiri", cgs.voteString+11)==0 )
{
sParm = CG_GetStringEdString("MENUS", "CAPTURE_THE_YSALIMARI");
}

30
codemp/client/FxScheduler.cpp
View file

@ -386,7 +386,7 @@ int CFxScheduler::ParseEffect( const char *file, CGPGroup *base )
if ((pair = base->GetPairs())!=0)
{
grpName = pair->GetName();
if ( !stricmp( grpName, "repeatDelay" ))
if ( !Q_stricmp( grpName, "repeatDelay" ))
{
effect->mRepeatDelay = atoi(pair->GetTopValue());
}
@ -403,55 +403,55 @@ int CFxScheduler::ParseEffect( const char *file, CGPGroup *base )
grpName = primitiveGroup->GetName();
// Huge stricmp lists suxor
if ( !stricmp( grpName, "particle" ))
if ( !Q_stricmp( grpName, "particle" ))
{
type = Particle;
}
else if ( !stricmp( grpName, "line" ))
else if ( !Q_stricmp( grpName, "line" ))
{
type = Line;
}
else if ( !stricmp( grpName, "tail" ))
else if ( !Q_stricmp( grpName, "tail" ))
{
type = Tail;
}
else if ( !stricmp( grpName, "sound" ))
else if ( !Q_stricmp( grpName, "sound" ))
{
type = Sound;
}
else if ( !stricmp( grpName, "cylinder" ))
else if ( !Q_stricmp( grpName, "cylinder" ))
{
type = Cylinder;
}
else if ( !stricmp( grpName, "electricity" ))
else if ( !Q_stricmp( grpName, "electricity" ))
{
type = Electricity;
}
else if ( !stricmp( grpName, "emitter" ))
else if ( !Q_stricmp( grpName, "emitter" ))
{
type = Emitter;
}
else if ( !stricmp( grpName, "decal" ))
else if ( !Q_stricmp( grpName, "decal" ))
{
type = Decal;
}
else if ( !stricmp( grpName, "orientedparticle" ))
else if ( !Q_stricmp( grpName, "orientedparticle" ))
{
type = OrientedParticle;
}
else if ( !stricmp( grpName, "fxrunner" ))
else if ( !Q_stricmp( grpName, "fxrunner" ))
{
type = FxRunner;
}
else if ( !stricmp( grpName, "light" ))
else if ( !Q_stricmp( grpName, "light" ))
{
type = Light;
}
else if ( !stricmp( grpName, "cameraShake" ))
else if ( !Q_stricmp( grpName, "cameraShake" ))
{
type = CameraShake;
}
else if ( !stricmp( grpName, "flash" ))
else if ( !Q_stricmp( grpName, "flash" ))
{
type = ScreenFlash;
}
@ -645,7 +645,7 @@ CPrimitiveTemplate *CFxScheduler::GetPrimitiveCopy( SEffectTemplate *effectCopy,
for ( int i = 0; i < effectCopy->mPrimitiveCount; i++ )
{
if ( !stricmp( effectCopy->mPrimitives[i]->mName, componentName ))
if ( !Q_stricmp( effectCopy->mPrimitives[i]->mName, componentName ))
{
// we found a match, so return it
return effectCopy->mPrimitives[i];

2
codemp/client/FxScheduler.h
View file

@ -354,7 +354,7 @@ struct SEffectTemplate
bool operator == (const char * name) const
{
return !stricmp( mEffectName, name );
return !Q_stricmp( mEffectName, name );
}
void operator=(const SEffectTemplate &that);
};

188
codemp/client/FxTemplate.cpp
View file

@ -276,23 +276,23 @@ bool CPrimitiveTemplate::ParseGroupFlags( const char *val, int *flags )
return true;
}
if ( !stricmp( flag[i], "linear" ))
if ( !Q_stricmp( flag[i], "linear" ))
{
*flags |= FX_LINEAR;
}
else if ( !stricmp( flag[i], "nonlinear" ))
else if ( !Q_stricmp( flag[i], "nonlinear" ))
{
*flags |= FX_NONLINEAR;
}
else if ( !stricmp( flag[i], "wave" ))
else if ( !Q_stricmp( flag[i], "wave" ))
{
*flags |= FX_WAVE;
}
else if ( !stricmp( flag[i], "random" ))
else if ( !Q_stricmp( flag[i], "random" ))
{
*flags |= FX_RAND;
}
else if ( !stricmp( flag[i], "clamp" ))
else if ( !Q_stricmp( flag[i], "clamp" ))
{
*flags |= FX_CLAMP;
}
@ -719,73 +719,73 @@ bool CPrimitiveTemplate::ParseFlags( const char *val )
return true;
}
if ( !stricmp( flag[i], "useModel" ))
if ( !Q_stricmp( flag[i], "useModel" ))
{
mFlags |= FX_ATTACHED_MODEL;
}
else if ( !stricmp( flag[i], "useBBox" ))
else if ( !Q_stricmp( flag[i], "useBBox" ))
{
mFlags |= FX_USE_BBOX;
}
else if ( !stricmp( flag[i], "usePhysics" ))
else if ( !Q_stricmp( flag[i], "usePhysics" ))
{
mFlags |= FX_APPLY_PHYSICS;
}
else if ( !stricmp( flag[i], "expensivePhysics" ))
else if ( !Q_stricmp( flag[i], "expensivePhysics" ))
{
mFlags |= FX_EXPENSIVE_PHYSICS;
}
//rww - begin g2 stuff
else if ( !stricmp( flag[i], "ghoul2Collision" ))
else if ( !Q_stricmp( flag[i], "ghoul2Collision" ))
{
mFlags |= (FX_GHOUL2_TRACE|FX_APPLY_PHYSICS|FX_EXPENSIVE_PHYSICS);
}
else if ( !stricmp( flag[i], "ghoul2Decals" ))
else if ( !Q_stricmp( flag[i], "ghoul2Decals" ))
{
mFlags |= FX_GHOUL2_DECALS;
}
//rww - end
else if ( !stricmp( flag[i], "impactKills" ))
else if ( !Q_stricmp( flag[i], "impactKills" ))
{
mFlags |= FX_KILL_ON_IMPACT;
}
else if ( !stricmp( flag[i], "impactFx" ))
else if ( !Q_stricmp( flag[i], "impactFx" ))
{
mFlags |= FX_IMPACT_RUNS_FX;
}
else if ( !stricmp( flag[i], "deathFx" ))
else if ( !Q_stricmp( flag[i], "deathFx" ))
{
mFlags |= FX_DEATH_RUNS_FX;
}
else if ( !stricmp( flag[i], "useAlpha" ))
else if ( !Q_stricmp( flag[i], "useAlpha" ))
{
mFlags |= FX_USE_ALPHA;
}
else if ( !stricmp( flag[i], "emitFx" ))
else if ( !Q_stricmp( flag[i], "emitFx" ))
{
mFlags |= FX_EMIT_FX;
}
else if ( !stricmp( flag[i], "depthHack" ))
else if ( !Q_stricmp( flag[i], "depthHack" ))
{
mFlags |= FX_DEPTH_HACK;
}
else if ( !stricmp( flag[i], "relative" ))
else if ( !Q_stricmp( flag[i], "relative" ))
{
mFlags |= FX_RELATIVE;
}
else if ( !stricmp( flag[i], "setShaderTime" ))
else if ( !Q_stricmp( flag[i], "setShaderTime" ))
{
mFlags |= FX_SET_SHADER_TIME;
}
else if ( !stricmp( flag[i], "paperPhysics" ))
else if ( !Q_stricmp( flag[i], "paperPhysics" ))
{
mFlags |= FX_PAPER_PHYSICS; //warning! shared flag. You use this with a cylinder and you can expect evilness to ensue
}
else if ( !stricmp( flag[i], "localizedFlash" ))
else if ( !Q_stricmp( flag[i], "localizedFlash" ))
{
mFlags |= FX_LOCALIZED_FLASH; //warning! shared flag. You use this with a cylinder and you can expect evilness to ensue
}
else if ( !stricmp( flag[i], "playerView" ))
else if ( !Q_stricmp( flag[i], "playerView" ))
{
mFlags |= FX_PLAYER_VIEW; //warning! shared flag. You use this with a cylinder and you can expect evilness to ensue
}
@ -824,59 +824,59 @@ bool CPrimitiveTemplate::ParseSpawnFlags( const char *val )
return true;
}
if ( !stricmp( flag[i], "org2fromTrace" ))
if ( !Q_stricmp( flag[i], "org2fromTrace" ))
{
mSpawnFlags |= FX_ORG2_FROM_TRACE;
}
else if ( !stricmp( flag[i], "traceImpactFx" ))
else if ( !Q_stricmp( flag[i], "traceImpactFx" ))
{
mSpawnFlags |= FX_TRACE_IMPACT_FX;
}
else if ( !stricmp( flag[i], "org2isOffset" ))
else if ( !Q_stricmp( flag[i], "org2isOffset" ))
{
mSpawnFlags |= FX_ORG2_IS_OFFSET;
}
else if ( !stricmp( flag[i], "cheapOrgCalc" ))
else if ( !Q_stricmp( flag[i], "cheapOrgCalc" ))
{
mSpawnFlags |= FX_CHEAP_ORG_CALC;
}
else if ( !stricmp( flag[i], "cheapOrg2Calc" ))
else if ( !Q_stricmp( flag[i], "cheapOrg2Calc" ))
{
mSpawnFlags |= FX_CHEAP_ORG2_CALC;
}
else if ( !stricmp( flag[i], "absoluteVel" ))
else if ( !Q_stricmp( flag[i], "absoluteVel" ))
{
mSpawnFlags |= FX_VEL_IS_ABSOLUTE;
}
else if ( !stricmp( flag[i], "absoluteAccel" ))
else if ( !Q_stricmp( flag[i], "absoluteAccel" ))
{
mSpawnFlags |= FX_ACCEL_IS_ABSOLUTE;
}
else if ( !stricmp( flag[i], "orgOnSphere" )) // sphere/ellipsoid
else if ( !Q_stricmp( flag[i], "orgOnSphere" )) // sphere/ellipsoid
{
mSpawnFlags |= FX_ORG_ON_SPHERE;
}
else if ( !stricmp( flag[i], "orgOnCylinder" )) // cylinder/disk
else if ( !Q_stricmp( flag[i], "orgOnCylinder" )) // cylinder/disk
{
mSpawnFlags |= FX_ORG_ON_CYLINDER;
}
else if ( !stricmp( flag[i], "axisFromSphere" ))
else if ( !Q_stricmp( flag[i], "axisFromSphere" ))
{
mSpawnFlags |= FX_AXIS_FROM_SPHERE;
}
else if ( !stricmp( flag[i], "randrotaroundfwd" ))
else if ( !Q_stricmp( flag[i], "randrotaroundfwd" ))
{
mSpawnFlags |= FX_RAND_ROT_AROUND_FWD;
}
else if ( !stricmp( flag[i], "evenDistribution" ))
else if ( !Q_stricmp( flag[i], "evenDistribution" ))
{
mSpawnFlags |= FX_EVEN_DISTRIBUTION;
}
else if ( !stricmp( flag[i], "rgbComponentInterpolation" ))
else if ( !Q_stricmp( flag[i], "rgbComponentInterpolation" ))
{
mSpawnFlags |= FX_RGB_COMPONENT_INTERP;
}
else if ( !stricmp( flag[i], "affectedByWind" ))
else if ( !Q_stricmp( flag[i], "affectedByWind" ))
{
mSpawnFlags |= FX_AFFECTED_BY_WIND;
}
@ -893,7 +893,7 @@ bool CPrimitiveTemplate::ParseSpawnFlags( const char *val )
bool CPrimitiveTemplate::ParseMaterialImpact(const char *val)
{
if (!stricmp(val, "shellsound"))
if (!Q_stricmp(val, "shellsound"))
{
mMatImpactFX = MATIMPACTFX_SHELLSOUND;
}
@ -1942,19 +1942,19 @@ bool CPrimitiveTemplate::ParseRGB( CGPGroup *grp )
val = pairs->GetTopValue();
// Huge stricmp lists suxor
if ( !stricmp( key, "start" ))
if ( !Q_stricmp( key, "start" ))
{
ParseRGBStart( val );
}
else if ( !stricmp( key, "end" ))
else if ( !Q_stricmp( key, "end" ))
{
ParseRGBEnd( val );
}
else if ( !stricmp( key, "parm" ) || !stricmp( key, "parms" ))
else if ( !Q_stricmp( key, "parm" ) || !Q_stricmp( key, "parms" ))
{
ParseRGBParm( val );
}
else if ( !stricmp( key, "flags" ) || !stricmp( key, "flag" ))
else if ( !Q_stricmp( key, "flags" ) || !Q_stricmp( key, "flag" ))
{
ParseRGBFlags( val );
}
@ -1996,19 +1996,19 @@ bool CPrimitiveTemplate::ParseAlpha( CGPGroup *grp )
val = pairs->GetTopValue();
// Huge stricmp lists suxor
if ( !stricmp( key, "start" ))
if ( !Q_stricmp( key, "start" ))
{
ParseAlphaStart( val );
}
else if ( !stricmp( key, "end" ))
else if ( !Q_stricmp( key, "end" ))
{
ParseAlphaEnd( val );
}
else if ( !stricmp( key, "parm" ) || !stricmp( key, "parms" ))
else if ( !Q_stricmp( key, "parm" ) || !Q_stricmp( key, "parms" ))
{
ParseAlphaParm( val );
}
else if ( !stricmp( key, "flags" ) || !stricmp( key, "flag" ))
else if ( !Q_stricmp( key, "flags" ) || !Q_stricmp( key, "flag" ))
{
ParseAlphaFlags( val );
}
@ -2050,19 +2050,19 @@ bool CPrimitiveTemplate::ParseSize( CGPGroup *grp )
val = pairs->GetTopValue();
// Huge stricmp lists suxor
if ( !stricmp( key, "start" ))
if ( !Q_stricmp( key, "start" ))
{
ParseSizeStart( val );
}
else if ( !stricmp( key, "end" ))
else if ( !Q_stricmp( key, "end" ))
{
ParseSizeEnd( val );
}
else if ( !stricmp( key, "parm" ) || !stricmp( key, "parms" ))
else if ( !Q_stricmp( key, "parm" ) || !Q_stricmp( key, "parms" ))
{
ParseSizeParm( val );
}
else if ( !stricmp( key, "flags" ) || !stricmp( key, "flag" ))
else if ( !Q_stricmp( key, "flags" ) || !Q_stricmp( key, "flag" ))
{
ParseSizeFlags( val );
}
@ -2104,19 +2104,19 @@ bool CPrimitiveTemplate::ParseSize2( CGPGroup *grp )
val = pairs->GetTopValue();
// Huge stricmp lists suxor
if ( !stricmp( key, "start" ))
if ( !Q_stricmp( key, "start" ))
{
ParseSize2Start( val );
}
else if ( !stricmp( key, "end" ))
else if ( !Q_stricmp( key, "end" ))
{
ParseSize2End( val );
}
else if ( !stricmp( key, "parm" ) || !stricmp( key, "parms" ))
else if ( !Q_stricmp( key, "parm" ) || !Q_stricmp( key, "parms" ))
{
ParseSize2Parm( val );
}
else if ( !stricmp( key, "flags" ) || !stricmp( key, "flag" ))
else if ( !Q_stricmp( key, "flags" ) || !Q_stricmp( key, "flag" ))
{
ParseSize2Flags( val );
}
@ -2158,19 +2158,19 @@ bool CPrimitiveTemplate::ParseLength( CGPGroup *grp )
val = pairs->GetTopValue();
// Huge stricmp lists suxor
if ( !stricmp( key, "start" ))
if ( !Q_stricmp( key, "start" ))
{
ParseLengthStart( val );
}
else if ( !stricmp( key, "end" ))
else if ( !Q_stricmp( key, "end" ))
{
ParseLengthEnd( val );
}
else if ( !stricmp( key, "parm" ) || !stricmp( key, "parms" ))
else if ( !Q_stricmp( key, "parm" ) || !Q_stricmp( key, "parms" ))
{
ParseLengthParm( val );
}
else if ( !stricmp( key, "flags" ) || !stricmp( key, "flag" ))
else if ( !Q_stricmp( key, "flags" ) || !Q_stricmp( key, "flag" ))
{
ParseLengthFlags( val );
}
@ -2206,128 +2206,128 @@ bool CPrimitiveTemplate::ParsePrimitive( CGPGroup *grp )
val = pairs->GetTopValue();
// Huge stricmp lists suxor
if ( !stricmp( key, "count" ))
if ( !Q_stricmp( key, "count" ))
{
ParseCount( val );
}
else if ( !stricmp( key, "shaders" ) || !stricmp( key, "shader" ))
else if ( !Q_stricmp( key, "shaders" ) || !Q_stricmp( key, "shader" ))
{
ParseShaders( pairs );
}
else if ( !stricmp( key, "models" ) || !stricmp( key, "model" ))
else if ( !Q_stricmp( key, "models" ) || !Q_stricmp( key, "model" ))
{
ParseModels( pairs );
}
else if ( !stricmp( key, "sounds" ) || !stricmp( key, "sound" ))
else if ( !Q_stricmp( key, "sounds" ) || !Q_stricmp( key, "sound" ))
{
ParseSounds( pairs );
}
else if ( !stricmp( key, "impactfx" ))
else if ( !Q_stricmp( key, "impactfx" ))
{
ParseImpactFxStrings( pairs );
}
else if ( !stricmp( key, "deathfx" ))
else if ( !Q_stricmp( key, "deathfx" ))
{
ParseDeathFxStrings( pairs );
}
else if ( !stricmp( key, "emitfx" ))
else if ( !Q_stricmp( key, "emitfx" ))
{
ParseEmitterFxStrings( pairs );
}
else if ( !stricmp( key, "playfx" ))
else if ( !Q_stricmp( key, "playfx" ))
{
ParsePlayFxStrings( pairs );
}
else if ( !stricmp( key, "life" ))
else if ( !Q_stricmp( key, "life" ))
{
ParseLife( val );
}
else if ( !stricmp( key, "delay" ))
else if ( !Q_stricmp( key, "delay" ))
{
ParseDelay( val );
}
else if ( !stricmp( key, "cullrange" ))
else if ( !Q_stricmp( key, "cullrange" ))
{
// mCullRange = atoi( val );
// mCullRange *= mCullRange; // square it now so we don't have to square every time we compare
}
else if ( !stricmp( key, "bounce" ) || !stricmp( key, "intensity" )) // me==bad for reusing this...but it shouldn't hurt anything)
else if ( !Q_stricmp( key, "bounce" ) || !Q_stricmp( key, "intensity" )) // me==bad for reusing this...but it shouldn't hurt anything)
{
ParseElasticity( val );
}
else if ( !stricmp( key, "min" ))
else if ( !Q_stricmp( key, "min" ))
{
ParseMin( val );
}
else if ( !stricmp( key, "max" ))
else if ( !Q_stricmp( key, "max" ))
{
ParseMax( val );
}
else if ( !stricmp( key, "angle" ) || !stricmp( key, "angles" ))
else if ( !Q_stricmp( key, "angle" ) || !Q_stricmp( key, "angles" ))
{
ParseAngle( val );
}
else if ( !stricmp( key, "angleDelta" ))
else if ( !Q_stricmp( key, "angleDelta" ))
{
ParseAngleDelta( val );
}
else if ( !stricmp( key, "velocity" ) || !stricmp( key, "vel" ))
else if ( !Q_stricmp( key, "velocity" ) || !Q_stricmp( key, "vel" ))
{
ParseVelocity( val );
}
else if ( !stricmp( key, "acceleration" ) || !stricmp( key, "accel" ))
else if ( !Q_stricmp( key, "acceleration" ) || !Q_stricmp( key, "accel" ))
{
ParseAcceleration( val );
}
else if ( !stricmp( key, "gravity" ))
else if ( !Q_stricmp( key, "gravity" ))
{
ParseGravity( val );
}
else if ( !stricmp( key, "density" ))
else if ( !Q_stricmp( key, "density" ))
{
ParseDensity( val );
}
else if ( !stricmp( key, "variance" ))
else if ( !Q_stricmp( key, "variance" ))
{
ParseVariance( val );
}
else if ( !stricmp( key, "origin" ))
else if ( !Q_stricmp( key, "origin" ))
{
ParseOrigin1( val );
}
else if ( !stricmp( key, "origin2" ))
else if ( !Q_stricmp( key, "origin2" ))
{
ParseOrigin2( val );
}
else if ( !stricmp( key, "radius" )) // part of ellipse/cylinder calcs.
else if ( !Q_stricmp( key, "radius" )) // part of ellipse/cylinder calcs.
{
ParseRadius( val );
}
else if ( !stricmp( key, "height" )) // part of ellipse/cylinder calcs.
else if ( !Q_stricmp( key, "height" )) // part of ellipse/cylinder calcs.
{
ParseHeight( val );
}
else if ( !stricmp( key, "wind" ))
else if ( !Q_stricmp( key, "wind" ))
{
ParseWindModifier( val );
}
else if ( !stricmp( key, "rotation" ))
else if ( !Q_stricmp( key, "rotation" ))
{
ParseRotation( val );
}
else if ( !stricmp( key, "rotationDelta" ))
else if ( !Q_stricmp( key, "rotationDelta" ))
{
ParseRotationDelta( val );
}
else if ( !stricmp( key, "flags" ) || !stricmp( key, "flag" ))
else if ( !Q_stricmp( key, "flags" ) || !Q_stricmp( key, "flag" ))
{ // these need to get passed on to the primitive
ParseFlags( val );
}
else if ( !stricmp( key, "spawnFlags" ) || !stricmp( key, "spawnFlag" ))
else if ( !Q_stricmp( key, "spawnFlags" ) || !Q_stricmp( key, "spawnFlag" ))
{ // these are used to spawn things in cool ways, but don't ever get passed on to prims.
ParseSpawnFlags( val );
}
else if ( !stricmp( key, "name" ))
else if ( !Q_stricmp( key, "name" ))
{
if ( val )
{
@ -2335,7 +2335,7 @@ bool CPrimitiveTemplate::ParsePrimitive( CGPGroup *grp )
strcpy( mName, val );
}
}
else if (!stricmp(key, "materialImpact"))
else if (!Q_stricmp(key, "materialImpact"))
{
ParseMaterialImpact(val);
}
@ -2354,23 +2354,23 @@ bool CPrimitiveTemplate::ParsePrimitive( CGPGroup *grp )
{
key = subGrp->GetName();
if ( !stricmp( key, "rgb" ))
if ( !Q_stricmp( key, "rgb" ))
{
ParseRGB( subGrp );
}
else if ( !stricmp( key, "alpha" ))
else if ( !Q_stricmp( key, "alpha" ))
{
ParseAlpha( subGrp );
}
else if ( !stricmp( key, "size" ) || !stricmp( key, "width" ))
else if ( !Q_stricmp( key, "size" ) || !Q_stricmp( key, "width" ))
{
ParseSize( subGrp );
}
else if ( !stricmp( key, "size2" ) || !stricmp( key, "width2" ))
else if ( !Q_stricmp( key, "size2" ) || !Q_stricmp( key, "width2" ))
{
ParseSize2( subGrp );
}
else if ( !stricmp( key, "length" ) || !stricmp( key, "height" ))
else if ( !Q_stricmp( key, "length" ) || !Q_stricmp( key, "height" ))
{
ParseLength( subGrp );
}

2
codemp/client/cl_keys.cpp
View file

@ -1039,7 +1039,7 @@ int Key_StringToKeynum( char *str ) {
// scan for a text match
for ( i = 0 ; i < MAX_KEYS ; i++ )
{
if ( keynames[i].name && !stricmp( str, keynames[i].name ) )
if ( keynames[i].name && !Q_stricmp( str, keynames[i].name ) )
{
return keynames[i].keynum;
}

8
codemp/client/snd_ambient.cpp
View file

@ -202,7 +202,7 @@ static int AS_GetSetNameIDForString( const char *name )
for ( int i = 0; i < NUM_AS_SETS; i++ )
{
if ( stricmp( name, setNames[i] ) == 0 )
if ( Q_stricmp( name, setNames[i] ) == 0 )
return i;
}
@ -223,7 +223,7 @@ static int AS_GetKeywordIDForString( const char *name )
for ( int i = 0; i < NUM_AS_KEYWORDS; i++ )
{
if ( stricmp( name, keywordNames[i] ) == 0 )
if ( Q_stricmp( name, keywordNames[i] ) == 0 )
return i;
}
@ -679,7 +679,7 @@ static void AS_ParseHeader( void )
case SET_KEYWORD_TYPE:
sscanf( parseBuffer+parsePos, "%s %s", &tempBuffer, &typeBuffer );
if ( !stricmp( (const char *) typeBuffer, "ambientSet" ) )
if ( !Q_stricmp( (const char *) typeBuffer, "ambientSet" ) )
{
return;
}
@ -771,7 +771,7 @@ AS_AddPrecacheEntry
void AS_AddPrecacheEntry( const char *name )
{
if (!stricmp(name,"#clear"))
if (!Q_stricmp(name,"#clear"))
{
pMap->clear();
}

14
codemp/client/snd_dma.cpp
View file

@ -3818,28 +3818,28 @@ void S_SoundList_f( void ) {
if ( Cmd_Argc() == 2 )
{
if (!stricmp(Cmd_Argv(1), "shouldbeMP3"))
if (!Q_stricmp(Cmd_Argv(1), "shouldbeMP3"))
{
bShouldBeMP3 = qtrue;
}
else
if (!stricmp(Cmd_Argv(1), "wavonly"))
if (!Q_stricmp(Cmd_Argv(1), "wavonly"))
{
bWavOnly = qtrue;
}
else
{
if (!stricmp(Cmd_Argv(1), "1"))
if (!Q_stricmp(Cmd_Argv(1), "1"))
{
iVariantCap = 1;
}
else
if (!stricmp(Cmd_Argv(1), "2"))
if (!Q_stricmp(Cmd_Argv(1), "2"))
{
iVariantCap = 2;
}
else
if (!stricmp(Cmd_Argv(1), "3"))
if (!Q_stricmp(Cmd_Argv(1), "3"))
{
iVariantCap = 3;
}
@ -3890,7 +3890,7 @@ void S_SoundList_f( void ) {
sfx_t *sfx2;
for (sfx2 = s_knownSfx, i2=0 ; i2<s_numSfx ; i2++, sfx2++)
{
if (!stricmp(sFindName,sfx2->sSoundName))
if (!Q_stricmp(sFindName,sfx2->sSoundName))
{
bDumpThisOne = qfalse; // found a %1-variant of this, so use variant capping and ignore this sfx_t
break;
@ -5023,7 +5023,7 @@ static void S_UpdateBackgroundTrack( void )
// standard / non-dynamic one-track music...
//
LPCSTR psCommand = S_Music_GetRequestedState(); // special check just for "silence" case...
sboolean bShouldBeSilent = (psCommand && !stricmp(psCommand,"silence"));
sboolean bShouldBeSilent = (psCommand && !Q_stricmp(psCommand,"silence"));
float fDesiredVolume = bShouldBeSilent ? 0.0f : s_musicVolume->value;
//
// internal to this code is a volume-smoother...

6
codemp/client/snd_mem.cpp
View file

@ -618,15 +618,15 @@ static sboolean S_LoadSound_FileLoadAndNameAdjuster(char *psFilename, byte **pDa
// account for foreign voices...
//
extern cvar_t* s_language;
if (s_language && stricmp("DEUTSCH",s_language->string)==0)
if (s_language && Q_stricmp("DEUTSCH",s_language->string)==0)
{
strncpy(psVoice,"chr_d",5); // same number of letters as "chars"
}
else if (s_language && stricmp("FRANCAIS",s_language->string)==0)
else if (s_language && Q_stricmp("FRANCAIS",s_language->string)==0)
{
strncpy(psVoice,"chr_f",5); // same number of letters as "chars"
}
else if (s_language && stricmp("ESPANOL",s_language->string)==0)
else if (s_language && Q_stricmp("ESPANOL",s_language->string)==0)
{
strncpy(psVoice,"chr_e",5); // same number of letters as "chars"
}

2
codemp/client/snd_music.cpp
View file

@ -659,7 +659,7 @@ static sboolean Music_ParseLeveldata(const char *psLevelName)
// kludge up an enum, only interested in boss or not at the moment, so...
//
MusicState_e eMusicState = !stricmp(psMusicStateType,"boss") ? eBGRNDTRACK_BOSS : !stricmp(psMusicStateType,"death") ? eBGRNDTRACK_DEATH : eBGRNDTRACK_EXPLORE;
MusicState_e eMusicState = !Q_stricmp(psMusicStateType,"boss") ? eBGRNDTRACK_BOSS : !Q_stricmp(psMusicStateType,"death") ? eBGRNDTRACK_DEATH : eBGRNDTRACK_EXPLORE;
if (!MusicFile.MusicExitTimes.empty())
{

12
codemp/game/bg_panimate.c
View file

@ -1900,27 +1900,27 @@ void ParseAnimationEvtBlock(const char *aeb_filename, animevent_t *animEvents, a
{
break;
}
if ( stricmp( token, "CHAN_VOICE_ATTEN" ) == 0 )
if ( Q_stricmp( token, "CHAN_VOICE_ATTEN" ) == 0 )
{
animEvents[curAnimEvent].eventData[AED_SOUNDCHANNEL] = CHAN_VOICE_ATTEN;
}
else if ( stricmp( token, "CHAN_VOICE_GLOBAL" ) == 0 )
else if ( Q_stricmp( token, "CHAN_VOICE_GLOBAL" ) == 0 )
{
animEvents[curAnimEvent].eventData[AED_SOUNDCHANNEL] = CHAN_VOICE_GLOBAL;
}
else if ( stricmp( token, "CHAN_ANNOUNCER" ) == 0 )
else if ( Q_stricmp( token, "CHAN_ANNOUNCER" ) == 0 )
{
animEvents[curAnimEvent].eventData[AED_SOUNDCHANNEL] = CHAN_ANNOUNCER;
}
else if ( stricmp( token, "CHAN_BODY" ) == 0 )
else if ( Q_stricmp( token, "CHAN_BODY" ) == 0 )
{
animEvents[curAnimEvent].eventData[AED_SOUNDCHANNEL] = CHAN_BODY;
}
else if ( stricmp( token, "CHAN_WEAPON" ) == 0 )
else if ( Q_stricmp( token, "CHAN_WEAPON" ) == 0 )
{
animEvents[curAnimEvent].eventData[AED_SOUNDCHANNEL] = CHAN_WEAPON;
}
else if ( stricmp( token, "CHAN_VOICE" ) == 0 )
else if ( Q_stricmp( token, "CHAN_VOICE" ) == 0 )
{
animEvents[curAnimEvent].eventData[AED_SOUNDCHANNEL] = CHAN_VOICE;
}

2
codemp/game/g_items.c
View file

@ -2904,7 +2904,7 @@ void FinishSpawningItem( gentity_t *ent ) {
// create a Ghoul2 model if the world model is a glm
/* item = &bg_itemlist[ ent->s.modelindex ];
if (!stricmp(&item->world_model[0][strlen(item->world_model[0]) - 4], ".glm"))
if (!Q_stricmp(&item->world_model[0][strlen(item->world_model[0]) - 4], ".glm"))
{
trap_G2API_InitGhoul2Model(&ent->s, item->world_model[0], G_ModelIndex(item->world_model[0] ), 0, 0, 0, 0);
ent->s.radius = 60;

9
codemp/game/q_shared.h
View file

@ -186,7 +186,6 @@ static ID_INLINE float BigFloat(const float *l) { FloatSwap(l); }
#define MAC_STATIC
#define __cdecl
#define __declspec(x)
#define stricmp strcasecmp
#define ID_INLINE inline
#ifdef __ppc__
@ -262,9 +261,6 @@ static inline float LittleFloat (const float l) { return FloatSwap(&l); }
// just waste space and make big arrays static...
#ifdef __linux__
// bk001205 - from Makefile
#define stricmp strcasecmp
#define MAC_STATIC // bk: FIXME
#define ID_INLINE inline
@ -310,9 +306,6 @@ inline static float LittleFloat (const float *l) { return FloatSwap(l); }
// just waste space and make big arrays static...
#ifdef __OpenBSD__
// bk001205 - from Makefile
#define stricmp strcasecmp
#define MAC_STATIC // bk: FIXME
#define ID_INLINE inline
@ -357,8 +350,6 @@ inline static float LittleFloat (const float *l) { return FloatSwap(l); }
//======================= FreeBSD DEFINES =====================
#ifdef __FreeBSD__ // rb010123
#define stricmp strcasecmp
#define MAC_STATIC
#define ID_INLINE inline

2
codemp/ghoul2/G2_bolts.cpp
View file

@ -179,7 +179,7 @@ int G2_Add_Bolt(CGhoul2Info *ghlInfo, boltInfo_v &bltlist, surfaceInfo_v &slist,
{
skel = (mdxaSkel_t *)((byte *)mod_a->mdxa + sizeof(mdxaHeader_t) + offsets->offsets[x]);
// if name is the same, we found it
if (!stricmp(skel->name, boneName))
if (!Q_stricmp(skel->name, boneName))
{
break;
}

10
codemp/ghoul2/G2_bones.cpp
View file

@ -58,7 +58,7 @@ int G2_Find_Bone(const model_t *mod, boneInfo_v &blist, const char *boneName)
skel = (mdxaSkel_t *)((byte *)mod->mdxa + sizeof(mdxaHeader_t) + offsets->offsets[blist[i].boneNumber]);
// if name is the same, we found it
if (!stricmp(skel->name, boneName))
if (!Q_stricmp(skel->name, boneName))
{
return i;
}
@ -87,7 +87,7 @@ int G2_Add_Bone (const model_t *mod, boneInfo_v &blist, const char *boneName)
{
skel = (mdxaSkel_t *)((byte *)mod->mdxa + sizeof(mdxaHeader_t) + offsets->offsets[x]);
// if name is the same, we found it
if (!stricmp(skel->name, boneName))
if (!Q_stricmp(skel->name, boneName))
{
break;
}
@ -116,7 +116,7 @@ int G2_Add_Bone (const model_t *mod, boneInfo_v &blist, const char *boneName)
{
skel = (mdxaSkel_t *)((byte *)mod->mdxa + sizeof(mdxaHeader_t) + offsets->offsets[blist[i].boneNumber]);
// if name is the same, we found it
if (!stricmp(skel->name, boneName))
if (!Q_stricmp(skel->name, boneName))
{
return i;
}
@ -1303,7 +1303,7 @@ int G2_Find_Bone_Rag(CGhoul2Info *ghlInfo, boneInfo_v &blist, const char *boneNa
//skel = (mdxaSkel_t *)((byte *)aHeader + sizeof(mdxaHeader_t) + offsets->offsets[blist[i].boneNumber]);
// if name is the same, we found it
if (!stricmp(skel->name, boneName))
if (!Q_stricmp(skel->name, boneName))
{
return i;
}
@ -4905,4 +4905,4 @@ int G2_Get_Bone_Index(CGhoul2Info *ghoul2, const char *boneName)
model_t *mod_a = R_GetModelByHandle(mod_m->mdxm->animIndex);
return (G2_Find_Bone(mod_a, ghoul2->mBlist, boneName));
}
}

2
codemp/ghoul2/G2_misc.cpp
View file

@ -1825,7 +1825,7 @@ int G2_FindConfigStringSpace(char *name, int start, int max)
{
break;
}
if ( !stricmp( s, name ) )
if ( !Q_stricmp( s, name ) )
{
return i;
}

6
codemp/ghoul2/G2_surfaces.cpp
View file

@ -71,7 +71,7 @@ int G2_IsSurfaceLegal(void *mod, const char *surfaceName, int *flags)
for ( int i = 0 ; i < mod_m->mdxm->numSurfaces ; i++)
{
if (!stricmp(surfaceName, surf->name))
if (!Q_stricmp(surfaceName, surf->name))
{
*flags = surf->flags;
return i;
@ -125,7 +125,7 @@ mdxmSurface_t *G2_FindSurface(CGhoul2Info *ghlInfo, surfaceInfo_v &slist, const
surfInfo = (mdxmSurfHierarchy_t *)((byte *)surfIndexes + surfIndexes->offsets[surf->thisSurfaceIndex]);
// are these the droids we're looking for?
if (!stricmp (surfInfo->name, surfaceName))
if (!Q_stricmp (surfInfo->name, surfaceName))
{
// yup
if (surfIndex)
@ -251,7 +251,7 @@ int G2_IsSurfaceOff (CGhoul2Info *ghlInfo, surfaceInfo_v &slist, const char *sur
for ( int i = 0 ; i < mod->mdxm->numSurfaces ; i++)
{
if (!stricmp(surfaceName, surface->name))
if (!Q_stricmp(surfaceName, surface->name))
{
return surface->flags;
}

2
codemp/icarus/Interpreter.cpp
View file

@ -480,7 +480,7 @@ int CInterpreter::FindSymbol( const char *name, keywordArray_t *table)
for (ids = table; (strcmp(ids->m_keyword, "")); ids++)
{
if (!stricmp(name, ids->m_keyword))
if (!Q_stricmp(name, ids->m_keyword))
return ids->m_tokenvalue;
}

4
codemp/icarus/Q3_Interface.cpp
View file

@ -492,7 +492,7 @@ static int Q3_Evaluate( int p1Type, const char *p1, int p2Type, const char *p2,
case TK_STRING:
case TK_IDENTIFIER:
return (int) !stricmp( c1, c2 ); //NOTENOTE: The script uses proper string comparison logic (ex. ( a == a ) == true )
return (int) !Q_stricmp( c1, c2 ); //NOTENOTE: The script uses proper string comparison logic (ex. ( a == a ) == true )
break;
default:
@ -592,7 +592,7 @@ static int Q3_Evaluate( int p1Type, const char *p1, int p2Type, const char *p2,
case TK_STRING:
case TK_IDENTIFIER:
return (int) stricmp( c1, c2 );
return (int) Q_stricmp( c1, c2 );
break;
default:

4
codemp/icarus/Tokenizer.cpp
View file

@ -2071,7 +2071,7 @@ CToken* CTokenizer::TokenFromName(LPCTSTR name)
{
while (m_keywords[i].m_tokenvalue != TK_EOF)
{
if (stricmp(m_keywords[i].m_keyword, name) == 0)
if (Q_stricmp(m_keywords[i].m_keyword, name) == 0)
{
return CUserToken::Create(m_keywords[i].m_tokenvalue, name);
}
@ -2834,4 +2834,4 @@ CSymbolLookup* CSymbolLookup::GetChild()
CSymbolLookup* CSymbolLookup::GetParent()
{
return m_parent;
}
}

2
codemp/qcommon/GenericParser2.cpp
View file

@ -667,7 +667,7 @@ CGPGroup *CGPGroup::FindSubGroup(const char *name)
group = mSubGroups;
while(group)
{
if(!stricmp(name, group->GetName()))
if(!Q_stricmp(name, group->GetName()))
{
return(group);
}

2
codemp/qcommon/cm_load.cpp
View file

@ -1089,7 +1089,7 @@ int CM_LoadSubBSP(const char *name, qboolean clientload)
count = cmg.numSubModels;
for(i = 0; i < NumSubBSP; i++)
{
if (!stricmp(name, SubBSP[i].name))
if (!Q_stricmp(name, SubBSP[i].name))
{
return count;
}

2
codemp/qcommon/cm_load_xbox.cpp
View file

@ -1027,7 +1027,7 @@ int CM_LoadSubBSP(const char *name, qboolean clientload)
count = cmg.numSubModels;
for(i = 0; i < NumSubBSP; i++)
{
if (!stricmp(name, SubBSP[i].name))
if (!Q_stricmp(name, SubBSP[i].name))
{
return count;
}

4
codemp/qcommon/cm_terrain.cpp
View file

@ -64,7 +64,7 @@ void CCMLandScape::LoadTerrainDef(const char *td)
items = classes->GetSubGroups();
while(items)
{
if(!stricmp(items->GetName(), "altitudetexture"))
if(!Q_stricmp(items->GetName(), "altitudetexture"))
{
int height;
const char *shaderName;
@ -84,7 +84,7 @@ void CCMLandScape::LoadTerrainDef(const char *td)
}
}
}
else if(!stricmp(items->GetName(), "water"))
else if(!Q_stricmp(items->GetName(), "water"))
{
const char *shaderName;
CCMShader *shader;

4
codemp/qcommon/files_console.cpp
View file

@ -787,7 +787,7 @@ static int FS_AddFileToList( char *name, char *list[MAX_FOUND_FILES], int nfiles
return nfiles;
}
for ( i = 0 ; i < nfiles ; i++ ) {
if ( !stricmp( name, list[i] ) ) {
if ( !Q_stricmp( name, list[i] ) ) {
return nfiles; // allready in list
}
}
@ -898,7 +898,7 @@ static int FS_AddFileToListBuf( char *name, char *listbuf, int bufsize, int nfil
p = listbuf;
while ( *p ) {
if ( !stricmp( name, p ) ) {
if ( !Q_stricmp( name, p ) ) {
return nfiles; // already in list
}
p += strlen( p ) + 1;

26
codemp/qcommon/stringed_ingame.cpp
View file

@ -242,7 +242,7 @@ void CStringEdPackage::SetupNewFileParse( LPCSTR psFileName, SE_BOOL bLoadDebug
m_strCurrentFileRef_ParseOnly = sString; // eg "OBJECTIVES"
m_strLoadingLanguage_ParseOnly = ExtractLanguageFromPath( psFileName );
m_bLoadingEnglish_ParseOnly = (!stricmp( m_strLoadingLanguage_ParseOnly.c_str(), "english" )) ? SE_TRUE : SE_FALSE;
m_bLoadingEnglish_ParseOnly = (!Q_stricmp( m_strLoadingLanguage_ParseOnly.c_str(), "english" )) ? SE_TRUE : SE_FALSE;
m_bLoadDebug = bLoadDebug;
}
@ -493,13 +493,13 @@ static char *CopeWithDumbStringData( LPCSTR psSentence, LPCSTR psThisLanguage )
// Ok, bollocks to it, this will have to do. Any other languages that come later and have bugs in their text can
// get fixed by them typing it in properly in the first place...
//
if (!stricmp(psThisLanguage,"ENGLISH") ||
!stricmp(psThisLanguage,"FRENCH") ||
!stricmp(psThisLanguage,"GERMAN") ||
!stricmp(psThisLanguage,"ITALIAN") ||
!stricmp(psThisLanguage,"SPANISH") ||
!stricmp(psThisLanguage,"POLISH") ||
!stricmp(psThisLanguage,"RUSSIAN")
if (!Q_stricmp(psThisLanguage,"ENGLISH") ||
!Q_stricmp(psThisLanguage,"FRENCH") ||
!Q_stricmp(psThisLanguage,"GERMAN") ||
!Q_stricmp(psThisLanguage,"ITALIAN") ||
!Q_stricmp(psThisLanguage,"SPANISH") ||
!Q_stricmp(psThisLanguage,"POLISH") ||
!Q_stricmp(psThisLanguage,"RUSSIAN")
)
{
char *p;
@ -690,7 +690,7 @@ LPCSTR CStringEdPackage::ParseLine( LPCSTR psLine )
{
// if loading a foreign language...
//
SE_BOOL bSentenceIsEnglish = (!stricmp(sThisLanguage,"english")) ? SE_TRUE: SE_FALSE; // see whether this is the english master or not
SE_BOOL bSentenceIsEnglish = (!Q_stricmp(sThisLanguage,"english")) ? SE_TRUE: SE_FALSE; // see whether this is the english master or not
// this check can be omitted, I'm just being extra careful here...
//
@ -698,7 +698,7 @@ LPCSTR CStringEdPackage::ParseLine( LPCSTR psLine )
{
// basically this is just checking that an .STE file override is the same language as the .STR...
//
if (stricmp( m_strLoadingLanguage_ParseOnly.c_str(), sThisLanguage ))
if (Q_stricmp( m_strLoadingLanguage_ParseOnly.c_str(), sThisLanguage ))
{
psErrorMessage = va("Language \"%s\" found when expecting \"%s\"!\n", sThisLanguage, m_strLoadingLanguage_ParseOnly.c_str());
}
@ -797,7 +797,7 @@ void CStringEdPackage::SetString( LPCSTR psLocalReference, LPCSTR psNewString, S
{
// then this is foreign text (so check for "#same" resolving)...
//
if (!stricmp(psNewString, sSE_EXPORT_SAME))
if (!Q_stricmp(psNewString, sSE_EXPORT_SAME))
{
Entry.m_strString = m_strCurrentEntryEnglish_ParseOnly; // foreign "#same" is now english
if (m_bLoadDebug)
@ -1100,7 +1100,7 @@ int SE_GetNumLanguages(void)
// if english is available, it should always be first... ( I suppose )
//
if (!stricmp(psLanguage,"english"))
if (!Q_stricmp(psLanguage,"english"))
{
gvLanguagesAvailable.insert( gvLanguagesAvailable.begin(), psLanguage );
}
@ -1228,7 +1228,7 @@ LPCSTR SE_LoadLanguage( LPCSTR psLanguage, SE_BOOL bLoadDebug /* = SE_TRUE */ )
{
LPCSTR psThisLang = TheStringPackage.ExtractLanguageFromPath( p );
if ( !stricmp( psLanguage, psThisLang ) )
if ( !Q_stricmp( psLanguage, psThisLang ) )
{
psErrorMessage = SE_Load( p, bLoadDebug );
}

2
codemp/renderer/tr_init.cpp
View file

@ -329,7 +329,7 @@ void R_Splash()
#ifndef _XBOX
image_t *pImage;
/* const char* s = Cvar_VariableString("se_language");
if (stricmp(s,"english"))
if (Q_stricmp(s,"english"))
{
pImage = R_FindImageFile( "menu/splash_eur", qfalse, qfalse, qfalse, GL_CLAMP);
}

2
codemp/renderer/tr_model.cpp
View file

@ -436,7 +436,7 @@ static void RE_RegisterModels_DumpNonPure(void)
if (iInPak == -1 || iCheckSum != CachedModel.iPAKFileCheckSum)
{
if (stricmp(sDEFAULT_GLA_NAME ".gla" , psModelName)) // don't dump "*default.gla", that's program internal anyway
if (Q_stricmp(sDEFAULT_GLA_NAME ".gla" , psModelName)) // don't dump "*default.gla", that's program internal anyway
{
// either this is not from a PAK, or it's from a non-pure one, so ditch it...
//

6
codemp/renderer/tr_terrain.cpp
View file

@ -539,7 +539,7 @@ void CTRLandScape::LoadTerrainDef(const char *td)
{
const char* type = items->GetName ( );
if(!stricmp( type, "altitudetexture"))
if(!Q_stricmp( type, "altitudetexture"))
{
int height;
const char *shaderName;
@ -559,11 +559,11 @@ void CTRLandScape::LoadTerrainDef(const char *td)
}
}
}
else if(!stricmp(type, "water"))
else if(!Q_stricmp(type, "water"))
{
mWaterShader = R_GetShaderByHandle(RE_RegisterShader(items->FindPairValue("shader", "")));
}
else if(!stricmp(type, "flattexture"))
else if(!Q_stricmp(type, "flattexture"))
{
mFlatShader = RE_RegisterShader ( items->FindPairValue("shader", "") );
}

20
codemp/ui/ui_main.c
View file

@ -5650,7 +5650,7 @@ static void UI_GetCharacterCvars ( void )
for (i = 0; i < uiInfo.playerSpeciesCount; i++)
{
if ( !stricmp(model, uiInfo.playerSpecies[i].Name) )
if ( !Q_stricmp(model, uiInfo.playerSpecies[i].Name) )
{
uiInfo.playerSpeciesIndex = i;
break;
@ -5662,7 +5662,7 @@ static void UI_GetCharacterCvars ( void )
model = UI_Cvar_VariableString ( "ui_char_model" );
for (i = 0; i < uiInfo.playerSpeciesCount; i++)
{
if ( !stricmp(model, uiInfo.playerSpecies[i].Name) )
if ( !Q_stricmp(model, uiInfo.playerSpecies[i].Name) )
{
uiInfo.playerSpeciesIndex = i;
return; //FOUND IT, don't fall through
@ -8634,7 +8634,7 @@ static int UI_FeederCount(float feederID)
for (i=0;i< WP_NUM_WEAPONS;i++)
{
trap_Cvar_VariableStringBuffer( va("ui_class_weapon%i", i), info, sizeof(info) );
if (stricmp(info,"gfx/2d/select")!=0)
if (Q_stricmp(info,"gfx/2d/select")!=0)
{
count++;
}
@ -8649,8 +8649,8 @@ static int UI_FeederCount(float feederID)
{
trap_Cvar_VariableStringBuffer( va("ui_class_item%i", i), info, sizeof(info) );
// A hack so health and ammo dispenser icons don't show up.
if ((stricmp(info,"gfx/2d/select")!=0) && (stricmp(info,"gfx/hud/i_icon_healthdisp")!=0) &&
(stricmp(info,"gfx/hud/i_icon_ammodisp")!=0))
if ((Q_stricmp(info,"gfx/2d/select")!=0) && (Q_stricmp(info,"gfx/hud/i_icon_healthdisp")!=0) &&
(Q_stricmp(info,"gfx/hud/i_icon_ammodisp")!=0))
{
count++;
}
@ -8663,7 +8663,7 @@ static int UI_FeederCount(float feederID)
for (i=0;i< NUM_FORCE_POWERS;i++)
{
trap_Cvar_VariableStringBuffer( va("ui_class_power%i", i), info, sizeof(info) );
if (stricmp(info,"gfx/2d/select")!=0)
if (Q_stricmp(info,"gfx/2d/select")!=0)
{
count++;
}
@ -9358,7 +9358,7 @@ static qhandle_t UI_FeederItemImage(float feederID, int index) {
for (i=0;i< WP_NUM_WEAPONS;i++)
{
trap_Cvar_VariableStringBuffer( va("ui_class_weapon%i", i), info, sizeof(info) );
if (stricmp(info,"gfx/2d/select")!=0)
if (Q_stricmp(info,"gfx/2d/select")!=0)
{
if (validCnt == index)
{
@ -9376,8 +9376,8 @@ static qhandle_t UI_FeederItemImage(float feederID, int index) {
{
trap_Cvar_VariableStringBuffer( va("ui_class_item%i", i), info, sizeof(info) );
// A hack so health and ammo dispenser icons don't show up.
if ((stricmp(info,"gfx/2d/select")!=0) && (stricmp(info,"gfx/hud/i_icon_healthdisp")!=0) &&
(stricmp(info,"gfx/hud/i_icon_ammodisp")!=0))
if ((Q_stricmp(info,"gfx/2d/select")!=0) && (Q_stricmp(info,"gfx/hud/i_icon_healthdisp")!=0) &&
(Q_stricmp(info,"gfx/hud/i_icon_ammodisp")!=0))
{
if (validCnt == index)
{
@ -9416,7 +9416,7 @@ static qhandle_t UI_FeederItemImage(float feederID, int index) {
for (i=0;i< NUM_FORCE_POWERS;i++)
{
trap_Cvar_VariableStringBuffer( va("ui_class_power%i", i), info, sizeof(info) );
if (stricmp(info,"gfx/2d/select")!=0)
if (Q_stricmp(info,"gfx/2d/select")!=0)
{
if (validCnt == index)
{

2
codemp/ui/ui_shared.c
View file

@ -7671,7 +7671,7 @@ qboolean ItemParse_asset_model( itemDef_t *item, int handle ) {
temp = token.string;
#ifndef CGAME
if (!stricmp(token.string,"ui_char_model") )
if (!Q_stricmp(token.string,"ui_char_model") )
{
char modelPath[MAX_QPATH];
char ui_char_model[MAX_QPATH];

2
codemp/win32/win_glimp.cpp
View file

@ -1598,7 +1598,7 @@ void GLimp_EndFrame (void)
// don't flip if drawing to front buffer
//if ( stricmp( r_drawBuffer->string, "GL_FRONT" ) != 0 )
//if ( Q_stricmp( r_drawBuffer->string, "GL_FRONT" ) != 0 )
{
SwapBuffers( glw_state.hDC );
}

2
codemp/win32/win_glimp_console.cpp
View file

@ -169,7 +169,7 @@ static qboolean GLW_LoadOpenGL()
void GLimp_EndFrame (void)
{
// don't flip if drawing to front buffer
// if ( stricmp( r_drawBuffer->string, "GL_FRONT" ) != 0 )
// if ( Q_stricmp( r_drawBuffer->string, "GL_FRONT" ) != 0 )
{
}
}

2
codemp/win32/win_main_console.cpp
View file

@ -225,7 +225,7 @@ void Sys_Log( const char *file, const void *buffer, int size, bool flush ) {
FileInfo* cur = NULL;
for (int f = 0; f < num_files; ++f)
{
if (!stricmp(file, files[f].name))
if (!Q_stricmp(file, files[f].name))
{
cur = &files[f];
break;