This is an automated email from the git hooks/post-receive script. smcv pushed a commit to tag 1.51b in repository iortcw.
commit 4aad7c63df738744a86dd2e399029a7fedbda4c7 Author: MAN-AT-ARMS <m4n4t4...@gmail.com> Date: Mon Jun 12 18:11:20 2017 -0400 All: Unify checks for missing token --- MP/code/cgame/cg_info.c | 2 +- MP/code/cgame/cg_main.c | 4 +-- MP/code/cgame/cg_servercmds.c | 12 ++++----- MP/code/cgame/cg_view.c | 20 +++++++-------- MP/code/game/ai_cast_script_actions.c | 6 ++--- MP/code/game/bg_animation.c | 42 ++++++++++++++++---------------- MP/code/game/g_client.c | 6 ++--- MP/code/game/g_script_actions.c | 8 +++--- MP/code/ui/ui_main.c | 14 +++++------ MP/code/ui/ui_players.c | 16 ++++++------ SP/code/cgame/cg_info.c | 4 +-- SP/code/cgame/cg_main.c | 4 +-- SP/code/cgame/cg_servercmds.c | 2 +- SP/code/cgame/cg_sound.c | 2 +- SP/code/cgame/cg_view.c | 20 +++++++-------- SP/code/game/ai_cast_script_actions.c | 6 ++--- SP/code/game/bg_animation.c | 46 +++++++++++++++++------------------ SP/code/game/g_client.c | 8 +++--- SP/code/game/g_script_actions.c | 8 +++--- SP/code/ui/ui_main.c | 14 +++++------ SP/code/ui/ui_players.c | 16 ++++++------ 21 files changed, 130 insertions(+), 130 deletions(-) diff --git a/MP/code/cgame/cg_info.c b/MP/code/cgame/cg_info.c index 05cc5d7..efa813b 100644 --- a/MP/code/cgame/cg_info.c +++ b/MP/code/cgame/cg_info.c @@ -186,7 +186,7 @@ void CG_DrawStats( char *stats ) { varIndex = v; for ( j = 0; j < statsItems[i].numVars; j++ ) { token = COM_Parse( &str ); - if ( !token || !token[0] ) { + if ( !token[0] ) { CG_Error( "error parsing mission stats\n" ); return; } diff --git a/MP/code/cgame/cg_main.c b/MP/code/cgame/cg_main.c index 4329118..dbaf31f 100644 --- a/MP/code/cgame/cg_main.c +++ b/MP/code/cgame/cg_main.c @@ -1805,7 +1805,7 @@ qboolean CG_Load_Menu( char **p ) { return qtrue; } - if ( !token || token[0] == 0 ) { + if ( !token[0] ) { return qfalse; } @@ -1852,7 +1852,7 @@ void CG_LoadMenus( const char *menuFile ) { while ( 1 ) { token = COM_ParseExt( &p, qtrue ); - if ( !token || token[0] == 0 || token[0] == '}' ) { + if ( !token[0] || token[0] == '}' ) { break; } diff --git a/MP/code/cgame/cg_servercmds.c b/MP/code/cgame/cg_servercmds.c index f78278d..7b7c935 100644 --- a/MP/code/cgame/cg_servercmds.c +++ b/MP/code/cgame/cg_servercmds.c @@ -857,7 +857,7 @@ int CG_ParseVoiceChats( const char *filename, voiceChatList_t *voiceChatList, in voiceChats[i].id[0] = 0; } token = COM_ParseExt( p, qtrue ); - if ( !token || token[0] == 0 ) { + if ( !token[0] ) { return qtrue; } if ( !Q_stricmp( token, "female" ) ) { @@ -874,7 +874,7 @@ int CG_ParseVoiceChats( const char *filename, voiceChatList_t *voiceChatList, in voiceChatList->numVoiceChats = 0; while ( 1 ) { token = COM_ParseExt( p, qtrue ); - if ( !token || token[0] == 0 ) { + if ( !token[0] ) { return qtrue; } Com_sprintf( voiceChats[voiceChatList->numVoiceChats].id, sizeof( voiceChats[voiceChatList->numVoiceChats].id ), "%s", token ); @@ -888,7 +888,7 @@ int CG_ParseVoiceChats( const char *filename, voiceChatList_t *voiceChatList, in while ( 1 ) { token = COM_ParseExt( p, qtrue ); - if ( !token || token[0] == 0 ) { + if ( !token[0] ) { return qtrue; } if ( !Q_stricmp( token, "}" ) ) { @@ -896,14 +896,14 @@ int CG_ParseVoiceChats( const char *filename, voiceChatList_t *voiceChatList, in } voiceChats[voiceChatList->numVoiceChats].sounds[current] = trap_S_RegisterSound( token ); token = COM_ParseExt( p, qtrue ); - if ( !token || token[0] == 0 ) { + if ( !token[0] ) { return qtrue; } Com_sprintf( voiceChats[voiceChatList->numVoiceChats].chats[current], MAX_CHATSIZE, "%s", token ); // DHM - Nerve :: Specify sprite shader to show above player's head token = COM_ParseExt( p, qfalse ); - if ( !Q_stricmp( token, "}" ) || !token || token[0] == 0 ) { + if ( !token[0] || !Q_stricmp( token, "}" ) ) { voiceChats[voiceChatList->numVoiceChats].sprite[current] = trap_R_RegisterShader( "sprites/voiceChat" ); COM_RestoreParseSession( p ); } else { @@ -982,7 +982,7 @@ int CG_HeadModelVoiceChats( char *filename ) { p = &ptr; token = COM_ParseExt( p, qtrue ); - if ( !token || token[0] == 0 ) { + if ( !token[0] ) { return -1; } diff --git a/MP/code/cgame/cg_view.c b/MP/code/cgame/cg_view.c index 46a4fb4..f67cf21 100644 --- a/MP/code/cgame/cg_view.c +++ b/MP/code/cgame/cg_view.c @@ -1339,31 +1339,31 @@ void CG_DrawSkyBoxPortal( void ) { if ( cg_skybox.integer ) { token = COM_ParseExt( &cstr, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { CG_Error( "CG_DrawSkyBoxPortal: error parsing skybox configstring\n" ); } cg.refdef.vieworg[0] = atof( token ); token = COM_ParseExt( &cstr, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { CG_Error( "CG_DrawSkyBoxPortal: error parsing skybox configstring\n" ); } cg.refdef.vieworg[1] = atof( token ); token = COM_ParseExt( &cstr, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { CG_Error( "CG_DrawSkyBoxPortal: error parsing skybox configstring\n" ); } cg.refdef.vieworg[2] = atof( token ); token = COM_ParseExt( &cstr, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { CG_Error( "CG_DrawSkyBoxPortal: error parsing skybox configstring\n" ); } // setup fog the first time, ignore this part of the configstring after that token = COM_ParseExt( &cstr, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { CG_Error( "CG_DrawSkyBoxPortal: error parsing skybox configstring. No fog state\n" ); } else { vec4_t fogColor; @@ -1372,32 +1372,32 @@ void CG_DrawSkyBoxPortal( void ) { if ( atoi( token ) ) { // this camera has fog if ( 1 ) { token = COM_ParseExt( &cstr, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { CG_Error( "CG_DrawSkyBoxPortal: error parsing skybox configstring. No fog[0]\n" ); } fogColor[0] = atof( token ); token = COM_ParseExt( &cstr, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { CG_Error( "CG_DrawSkyBoxPortal: error parsing skybox configstring. No fog[1]\n" ); } fogColor[1] = atof( token ); token = COM_ParseExt( &cstr, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { CG_Error( "CG_DrawSkyBoxPortal: error parsing skybox configstring. No fog[2]\n" ); } fogColor[2] = atof( token ); token = COM_ParseExt( &cstr, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { fogStart = 0; } else { fogStart = atoi( token ); } token = COM_ParseExt( &cstr, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { fogEnd = 0; } else { fogEnd = atoi( token ); diff --git a/MP/code/game/ai_cast_script_actions.c b/MP/code/game/ai_cast_script_actions.c index ece142b..39f6f4e 100644 --- a/MP/code/game/ai_cast_script_actions.c +++ b/MP/code/game/ai_cast_script_actions.c @@ -708,7 +708,7 @@ qboolean AICast_ScriptAction_PlayAnim( cast_state_t *cs, char *params ) { // read the name token = COM_ParseExt( &pString, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { G_Error( "AI Scripting: syntax error\n\nplayanim <animation> <legs/torso/both>\n" ); } Q_strncpyz( tokens[0], token, sizeof( tokens[0] ) ); @@ -716,7 +716,7 @@ qboolean AICast_ScriptAction_PlayAnim( cast_state_t *cs, char *params ) { // read the body part token = COM_ParseExt( &pString, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { G_Error( "AI Scripting: syntax error\n\nplayanim <animation> <legs/torso/both>\n" ); } Q_strncpyz( tokens[1], token, sizeof( tokens[1] ) ); @@ -745,7 +745,7 @@ qboolean AICast_ScriptAction_PlayAnim( cast_state_t *cs, char *params ) { for ( i = 0; i < 3; i++ ) { token = COM_ParseExt( &pString, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { //G_Error("AI Scripting: syntax error\n\nplayanim <animation> <pausetime> [legs/torso/both]\n"); G_Printf( "AI Scripting: syntax error\n\nplayanim <animation> <pausetime> <legs/torso/both>\n" ); return qtrue; diff --git a/MP/code/game/bg_animation.c b/MP/code/game/bg_animation.c index 04be86b..54325df 100644 --- a/MP/code/game/bg_animation.c +++ b/MP/code/game/bg_animation.c @@ -621,7 +621,7 @@ qboolean BG_AnimParseAnimConfig( animModelInfo_t *animModelInfo, const char *fil Q_strlwr( animations[i].name ); // token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { BG_AnimParseError( "end of file without ENDANIMS" ); break; } @@ -647,21 +647,21 @@ qboolean BG_AnimParseAnimConfig( animModelInfo_t *animModelInfo, const char *fil } token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { BG_AnimParseError( "end of file without ENDANIMS" ); break; } animations[i].numFrames = atoi( token ); token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { BG_AnimParseError( "end of file without ENDANIMS: line %i", COM_GetCurrentParseLine() + 1 ); break; } animations[i].loopFrames = atoi( token ); token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { BG_AnimParseError( "end of file without ENDANIMS: line %i", COM_GetCurrentParseLine() + 1 ); break; } @@ -674,7 +674,7 @@ qboolean BG_AnimParseAnimConfig( animModelInfo_t *animModelInfo, const char *fil // movespeed token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { BG_AnimParseError( "end of file without ENDANIMS" ); break; } @@ -722,14 +722,14 @@ qboolean BG_AnimParseAnimConfig( animModelInfo_t *animModelInfo, const char *fil for ( i = 0 ; i < MAX_HEAD_ANIMS ; i++ ) { token = COM_Parse( &text_p ); - if ( !token || !token[0] ) { + if ( !token[0] ) { break; } if ( animModelInfo->version > 1 ) { // includes animation names at start of each line // just throw this information away, not required for head token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { break; } } @@ -743,7 +743,7 @@ qboolean BG_AnimParseAnimConfig( animModelInfo_t *animModelInfo, const char *fil headAnims[i].firstFrame -= animations[MAX_ANIMATIONS - 1].firstFrame + animations[MAX_ANIMATIONS - 1].numFrames + skip; token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { break; } headAnims[i].numFrames = atoi( token ); @@ -788,7 +788,7 @@ void BG_ParseConditionBits( char **text_pp, animStringItem_t *stringTable, int c while ( !endFlag ) { token = COM_ParseExt( text_pp, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { COM_RestoreParseSession( text_pp ); // go back to the previous token endFlag = qtrue; // done parsing indexes if ( !strlen( currentString ) ) { @@ -895,7 +895,7 @@ qboolean BG_ParseConditions( char **text_pp, animScriptItem_t *scriptItem ) { while ( 1 ) { token = COM_ParseExt( text_pp, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { break; } @@ -913,7 +913,7 @@ qboolean BG_ParseConditions( char **text_pp, animScriptItem_t *scriptItem ) { case ANIM_CONDTYPE_VALUE: if ( animConditionsTable[conditionIndex].values ) { token = COM_ParseExt( text_pp, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { BG_AnimParseError( "BG_AnimParseAnimScript: expected condition value, found end of line" ); // RF modification break; } @@ -959,7 +959,7 @@ void BG_ParseCommands( char **input, animScriptItem_t *scriptItem, animModelInfo // parse the body part token = COM_ParseExt( input, ( partIndex < 1 ) ); - if ( !token || !token[0] ) { + if ( !token[0] ) { break; } if ( !Q_stricmp( token, "}" ) ) { @@ -982,7 +982,7 @@ void BG_ParseCommands( char **input, animScriptItem_t *scriptItem, animModelInfo if ( command->bodyPart[partIndex] > 0 ) { // parse the animation token = COM_ParseExt( input, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { BG_AnimParseError( "BG_ParseCommands: expected animation" ); } command->animIndex[partIndex] = BG_AnimationIndexForString( token, parseClient ); @@ -1002,7 +1002,7 @@ void BG_ParseCommands( char **input, animScriptItem_t *scriptItem, animModelInfo if ( !Q_stricmp( token, "duration" ) ) { // read the duration token = COM_ParseExt( input, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { BG_AnimParseError( "BG_ParseCommands: expected duration value" ); break; } @@ -1025,14 +1025,14 @@ void BG_ParseCommands( char **input, animScriptItem_t *scriptItem, animModelInfo // parse optional parameters (sounds, etc) while ( 1 ) { token = COM_ParseExt( input, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { break; } if ( !Q_stricmp( token, "sound" ) ) { token = COM_ParseExt( input, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { BG_AnimParseError( "BG_ParseCommands: expected sound" ); break; } @@ -1123,7 +1123,7 @@ void BG_AnimParseAnimScript( animModelInfo_t *modelInfo, animScriptData_t *scrip while ( 1 ) { token = COM_Parse( &text_p ); - if ( !token || !token[0] ) { + if ( !token[0] ) { if ( indentLevel ) { BG_AnimParseError( "BG_AnimParseAnimScript: unexpected end of file: %s", token ); } @@ -1151,14 +1151,14 @@ void BG_AnimParseAnimScript( animModelInfo_t *modelInfo, animScriptData_t *scrip // read in the define type token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { BG_AnimParseError( "BG_AnimParseAnimScript: expected condition type string" ); // RF mod } defineType = BG_IndexForString( token, animConditionsStr, qfalse ); // read in the define token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { BG_AnimParseError( "BG_AnimParseAnimScript: expected condition define string" ); // RF mod } @@ -1231,7 +1231,7 @@ void BG_AnimParseAnimScript( animModelInfo_t *modelInfo, animScriptData_t *scrip //----(SA) // RF mod // check for the open bracket token = COM_ParseExt( &text_p, qtrue ); - if ( !token || Q_stricmp( token, "{" ) ) { + if ( !token[0] || Q_stricmp( token, "{" ) ) { BG_AnimParseError( "BG_AnimParseAnimScript: expected '{'" ); } indentLevel++; @@ -1353,7 +1353,7 @@ void BG_AnimParseAnimScript( animModelInfo_t *modelInfo, animScriptData_t *scrip //----(SA) // RF mod // check for the open bracket token = COM_ParseExt( &text_p, qtrue ); - if ( !token || Q_stricmp( token, "{" ) ) { + if ( !token[0] || Q_stricmp( token, "{" ) ) { BG_AnimParseError( "BG_AnimParseAnimScript: expected '{'" ); } indentLevel++; diff --git a/MP/code/game/g_client.c b/MP/code/game/g_client.c index 2eda571..67443f3 100644 --- a/MP/code/game/g_client.c +++ b/MP/code/game/g_client.c @@ -2171,7 +2171,7 @@ void G_RetrieveMoveSpeedsFromClient( int entnum, char *text ) { // get the model name token = COM_Parse( &text_p ); - if ( !token || !token[0] ) { + if ( !token[0] ) { G_Error( "G_RetrieveMoveSpeedsFromClient: internal error" ); } @@ -2184,7 +2184,7 @@ void G_RetrieveMoveSpeedsFromClient( int entnum, char *text ) { while ( 1 ) { token = COM_Parse( &text_p ); - if ( !token || !token[0] ) { + if ( !token[0] ) { break; } @@ -2196,7 +2196,7 @@ void G_RetrieveMoveSpeedsFromClient( int entnum, char *text ) { // get the movespeed token = COM_Parse( &text_p ); - if ( !token || !token[0] ) { + if ( !token[0] ) { G_Error( "G_RetrieveMoveSpeedsFromClient: missing movespeed" ); } anim->moveSpeed = atoi( token ); diff --git a/MP/code/game/g_script_actions.c b/MP/code/game/g_script_actions.c index c5f5ced..32a166c 100644 --- a/MP/code/game/g_script_actions.c +++ b/MP/code/game/g_script_actions.c @@ -373,7 +373,7 @@ qboolean G_ScriptAction_PlayAnim( gentity_t *ent, char *params ) { for ( i = 0; i < 2; i++ ) { token = COM_ParseExt( &pString, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { G_Printf( "G_Scripting: syntax error\n\nplayanim <startframe> <endframe> [LOOPING <duration>]\n" ); return qtrue; } else { @@ -391,7 +391,7 @@ qboolean G_ScriptAction_PlayAnim( gentity_t *ent, char *params ) { looping = qtrue; token = COM_ParseExt( &pString, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { G_Printf( "G_Scripting: syntax error\n\nplayanim <startframe> <endframe> [LOOPING <duration>]\n" ); return qtrue; } @@ -709,14 +709,14 @@ qboolean G_ScriptAction_FaceAngles( gentity_t *ent, char *params ) { pString = params; for ( i = 0; i < 3; i++ ) { token = COM_Parse( &pString ); - if ( !token || !token[0] ) { + if ( !token[0] ) { G_Error( "G_Scripting: syntax: faceangles <pitch> <yaw> <roll> <duration/GOTOTIME>\n" ); } angles[i] = atoi( token ); } token = COM_Parse( &pString ); - if ( !token || !token[0] ) { + if ( !token[0] ) { G_Error( "G_Scripting: faceangles requires a <pitch> <yaw> <roll> <duration/GOTOTIME>\n" ); } if ( !Q_strcasecmp( token, "gototime" ) ) { diff --git a/MP/code/ui/ui_main.c b/MP/code/ui/ui_main.c index b496e34..6df8bde 100644 --- a/MP/code/ui/ui_main.c +++ b/MP/code/ui/ui_main.c @@ -6413,7 +6413,7 @@ static qboolean Team_Parse(char **p) { return qtrue; } - if ( !token || token[0] == 0 ) { + if ( !token[0] ) { return qfalse; } @@ -6477,7 +6477,7 @@ static qboolean Character_Parse(char **p) { return qtrue; } - if ( !token || token[0] == 0 ) { + if ( !token[0] ) { return qfalse; } @@ -6533,7 +6533,7 @@ static qboolean Alias_Parse(char **p) { return qtrue; } - if ( !token || token[0] == 0 ) { + if ( !token[0] ) { return qfalse; } @@ -6583,7 +6583,7 @@ static void UI_ParseTeamInfo(const char *teamFile) { while ( 1 ) { token = COM_ParseExt( &p, qtrue ); - if( !token || token[0] == 0 || token[0] == '}') { + if( !token[0] || token[0] == '}') { break; } @@ -6638,7 +6638,7 @@ static qboolean GameType_Parse( char **p, qboolean join ) { return qtrue; } - if ( !token || token[0] == 0 ) { + if ( !token[0] ) { return qfalse; } @@ -6695,7 +6695,7 @@ static qboolean MapList_Parse( char **p ) { return qtrue; } - if ( !token || token[0] == 0 ) { + if ( !token[0] ) { return qfalse; } @@ -6756,7 +6756,7 @@ static void UI_ParseGameInfo( const char *teamFile ) { while ( 1 ) { token = COM_ParseExt( &p, qtrue ); - if ( !token || token[0] == 0 || token[0] == '}' ) { + if ( !token[0] || token[0] == '}' ) { break; } diff --git a/MP/code/ui/ui_players.c b/MP/code/ui/ui_players.c index 10075d4..f122e54 100644 --- a/MP/code/ui/ui_players.c +++ b/MP/code/ui/ui_players.c @@ -1154,7 +1154,7 @@ static qboolean AnimParseAnimConfig( playerInfo_t *animModelInfo, const char *fi Q_strlwr( animations[i].name ); // token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { // BG_AnimParseError( "end of file without ENDANIMS" ); break; } @@ -1180,21 +1180,21 @@ static qboolean AnimParseAnimConfig( playerInfo_t *animModelInfo, const char *fi } token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { // BG_AnimParseError( "end of file without ENDANIMS" ); break; } animations[i].numFrames = atoi( token ); token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { // BG_AnimParseError( "end of file without ENDANIMS: line %i" ); break; } animations[i].loopFrames = atoi( token ); token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { // BG_AnimParseError( "end of file without ENDANIMS: line %i" ); break; } @@ -1207,7 +1207,7 @@ static qboolean AnimParseAnimConfig( playerInfo_t *animModelInfo, const char *fi // movespeed token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { // BG_AnimParseError( "end of file without ENDANIMS" ); break; } @@ -1256,14 +1256,14 @@ static qboolean AnimParseAnimConfig( playerInfo_t *animModelInfo, const char *fi for ( i = 0 ; i < MAX_HEAD_ANIMS ; i++ ) { token = COM_Parse( &text_p ); - if ( !token || !token[0] ) { + if ( !token[0] ) { break; } if ( animModelInfo->version > 1 ) { // includes animation names at start of each line // just throw this information away, not required for head token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { break; } } @@ -1277,7 +1277,7 @@ static qboolean AnimParseAnimConfig( playerInfo_t *animModelInfo, const char *fi headAnims[i].firstFrame -= animations[MAX_ANIMATIONS - 1].firstFrame + animations[MAX_ANIMATIONS - 1].numFrames + skip; token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { break; } headAnims[i].numFrames = atoi( token ); diff --git a/SP/code/cgame/cg_info.c b/SP/code/cgame/cg_info.c index 77cc085..0731b4a 100644 --- a/SP/code/cgame/cg_info.c +++ b/SP/code/cgame/cg_info.c @@ -179,7 +179,7 @@ void CG_DrawStats( char *stats ) { if ( statsItems[i].numVars ) { for ( j = 0; j < statsItems[i].numVars; j++ ) { token = COM_Parse( &str ); - if ( !token || !token[0] ) { + if ( !token[0] ) { CG_Error( "error parsing mission stats\n" ); return; } @@ -310,7 +310,7 @@ void CG_DrawExitStats( void ) { varIndex = v; for ( j = 0; j < statsItems[i].numVars; j++ ) { token = COM_Parse( &mstats ); - if ( !token || !token[0] ) { + if ( !token[0] ) { CG_Error( "error parsing mission stats\n" ); return; } diff --git a/SP/code/cgame/cg_main.c b/SP/code/cgame/cg_main.c index cc6774b..d9258af 100644 --- a/SP/code/cgame/cg_main.c +++ b/SP/code/cgame/cg_main.c @@ -1846,7 +1846,7 @@ qboolean CG_Load_Menu( char **p ) { return qtrue; } - if ( !token || token[0] == 0 ) { + if ( !token[0] ) { return qfalse; } @@ -1893,7 +1893,7 @@ void CG_LoadMenus( const char *menuFile ) { while ( 1 ) { token = COM_ParseExt( &p, qtrue ); - if ( !token || token[0] == 0 || token[0] == '}' ) { + if ( !token[0] || token[0] == '}' ) { break; } diff --git a/SP/code/cgame/cg_servercmds.c b/SP/code/cgame/cg_servercmds.c index 9d7d8d3..c3f44d9 100644 --- a/SP/code/cgame/cg_servercmds.c +++ b/SP/code/cgame/cg_servercmds.c @@ -285,7 +285,7 @@ static void CG_ParseFog( void ) { token = COM_Parse( (char **)&info ); ne = atof( token ); token = COM_Parse( (char **)&info ); - if ( !token || !token[0] ) { + if ( !token[0] ) { // set to 'no fog' // 'FOG_MAP' is not registered, so it will always make fog go away trap_R_SetFog( FOG_CMD_SWITCHFOG, FOG_MAP, (int)ne, 0, 0, 0, 0 ); diff --git a/SP/code/cgame/cg_sound.c b/SP/code/cgame/cg_sound.c index c8cbfc8..21f73d7 100644 --- a/SP/code/cgame/cg_sound.c +++ b/SP/code/cgame/cg_sound.c @@ -337,7 +337,7 @@ static void CG_SoundParseSounds( char *filename, char *buffer ) { token = COM_ParseExt( text, qfalse ); sound.shakeRadius = atof( token ); token = COM_ParseExt( text, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { sound.shakeDuration = 350 + 900 * ( sound.shakeScale * sound.shakeScale ); } else { sound.shakeDuration = atoi( token ); diff --git a/SP/code/cgame/cg_view.c b/SP/code/cgame/cg_view.c index 521154d..2407159 100644 --- a/SP/code/cgame/cg_view.c +++ b/SP/code/cgame/cg_view.c @@ -1240,31 +1240,31 @@ void CG_DrawSkyBoxPortal( void ) { if ( cg_skybox.integer ) { token = COM_ParseExt( &cstr, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { CG_Error( "CG_DrawSkyBoxPortal: error parsing skybox configstring\n" ); } cg.refdef.vieworg[0] = atof( token ); token = COM_ParseExt( &cstr, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { CG_Error( "CG_DrawSkyBoxPortal: error parsing skybox configstring\n" ); } cg.refdef.vieworg[1] = atof( token ); token = COM_ParseExt( &cstr, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { CG_Error( "CG_DrawSkyBoxPortal: error parsing skybox configstring\n" ); } cg.refdef.vieworg[2] = atof( token ); token = COM_ParseExt( &cstr, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { CG_Error( "CG_DrawSkyBoxPortal: error parsing skybox configstring\n" ); } // setup fog the first time, ignore this part of the configstring after that token = COM_ParseExt( &cstr, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { CG_Error( "CG_DrawSkyBoxPortal: error parsing skybox configstring. No fog state\n" ); } else { vec4_t fogColor; @@ -1273,32 +1273,32 @@ void CG_DrawSkyBoxPortal( void ) { if ( atoi( token ) ) { // this camera has fog if ( 1 ) { token = COM_ParseExt( &cstr, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { CG_Error( "CG_DrawSkyBoxPortal: error parsing skybox configstring. No fog[0]\n" ); } fogColor[0] = atof( token ); token = COM_ParseExt( &cstr, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { CG_Error( "CG_DrawSkyBoxPortal: error parsing skybox configstring. No fog[1]\n" ); } fogColor[1] = atof( token ); token = COM_ParseExt( &cstr, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { CG_Error( "CG_DrawSkyBoxPortal: error parsing skybox configstring. No fog[2]\n" ); } fogColor[2] = atof( token ); token = COM_ParseExt( &cstr, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { fogStart = 0; } else { fogStart = atoi( token ); } token = COM_ParseExt( &cstr, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { fogEnd = 0; } else { fogEnd = atoi( token ); diff --git a/SP/code/game/ai_cast_script_actions.c b/SP/code/game/ai_cast_script_actions.c index 78a8a1a..5f62a94 100644 --- a/SP/code/game/ai_cast_script_actions.c +++ b/SP/code/game/ai_cast_script_actions.c @@ -772,7 +772,7 @@ qboolean AICast_ScriptAction_PlayAnim( cast_state_t *cs, char *params ) { // read the name token = COM_ParseExt( &pString, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { G_Error( "AI Scripting: syntax error\n\nplayanim <animation> <legs/torso/both>\n" ); } Q_strncpyz( tokens[0], token, sizeof( tokens[0] ) ); @@ -780,7 +780,7 @@ qboolean AICast_ScriptAction_PlayAnim( cast_state_t *cs, char *params ) { // read the body part token = COM_ParseExt( &pString, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { G_Error( "AI Scripting: syntax error\n\nplayanim <animation> <legs/torso/both>\n" ); } Q_strncpyz( tokens[1], token, sizeof( tokens[1] ) ); @@ -912,7 +912,7 @@ qboolean AICast_ScriptAction_PlayAnim( cast_state_t *cs, char *params ) { for ( i = 0; i < 3; i++ ) { token = COM_ParseExt( &pString, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { //G_Error("AI Scripting: syntax error\n\nplayanim <animation> <pausetime> [legs/torso/both]\n"); G_Printf( "AI Scripting: syntax error\n\nplayanim <animation> <pausetime> <legs/torso/both>\n" ); return qtrue; diff --git a/SP/code/game/bg_animation.c b/SP/code/game/bg_animation.c index 1f06e27..b45d02a 100644 --- a/SP/code/game/bg_animation.c +++ b/SP/code/game/bg_animation.c @@ -631,7 +631,7 @@ qboolean BG_AnimParseAnimConfig( animModelInfo_t *animModelInfo, const char *fil Q_strlwr( animations[i].name ); // token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { BG_AnimParseError( "end of file without ENDANIMS" ); break; } @@ -657,21 +657,21 @@ qboolean BG_AnimParseAnimConfig( animModelInfo_t *animModelInfo, const char *fil } token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { BG_AnimParseError( "end of file without ENDANIMS" ); break; } animations[i].numFrames = atoi( token ); token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { BG_AnimParseError( "end of file without ENDANIMS: line %i", COM_GetCurrentParseLine() + 1 ); break; } animations[i].loopFrames = atoi( token ); token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { BG_AnimParseError( "end of file without ENDANIMS: line %i", COM_GetCurrentParseLine() + 1 ); break; } @@ -684,7 +684,7 @@ qboolean BG_AnimParseAnimConfig( animModelInfo_t *animModelInfo, const char *fil // movespeed token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { BG_AnimParseError( "end of file without ENDANIMS" ); break; } @@ -693,7 +693,7 @@ qboolean BG_AnimParseAnimConfig( animModelInfo_t *animModelInfo, const char *fil // animation blending oldtext_p = text_p; token = COM_ParseExt( &text_p, qfalse ); // must be on same line - if ( !token || !token[0] ) { + if ( !token[0] ) { text_p = oldtext_p; animations[i].animBlend = 0; } else { @@ -703,7 +703,7 @@ qboolean BG_AnimParseAnimConfig( animModelInfo_t *animModelInfo, const char *fil // priority oldtext_p = text_p; token = COM_ParseExt( &text_p, qfalse ); // must be on same line - if ( !token || !token[0] ) { + if ( !token[0] ) { text_p = oldtext_p; // death anims have highest priority if ( !Q_strncmp( animations[i].name, "death", 5 ) ) { @@ -749,14 +749,14 @@ qboolean BG_AnimParseAnimConfig( animModelInfo_t *animModelInfo, const char *fil for ( i = 0 ; i < MAX_HEAD_ANIMS ; i++ ) { token = COM_Parse( &text_p ); - if ( !token || !token[0] ) { + if ( !token[0] ) { break; } if ( animModelInfo->version > 1 ) { // includes animation names at start of each line // just throw this information away, not required for head token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { break; } } @@ -770,7 +770,7 @@ qboolean BG_AnimParseAnimConfig( animModelInfo_t *animModelInfo, const char *fil headAnims[i].firstFrame -= animations[MAX_ANIMATIONS - 1].firstFrame + animations[MAX_ANIMATIONS - 1].numFrames + skip; token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { break; } headAnims[i].numFrames = atoi( token ); @@ -815,7 +815,7 @@ void BG_ParseConditionBits( char **text_pp, animStringItem_t *stringTable, int c while ( !endFlag ) { token = COM_ParseExt( text_pp, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { COM_RestoreParseSession( text_pp ); // go back to the previous token endFlag = qtrue; // done parsing indexes if ( !strlen( currentString ) ) { @@ -922,7 +922,7 @@ qboolean BG_ParseConditions( char **text_pp, animScriptItem_t *scriptItem ) { while ( 1 ) { token = COM_ParseExt( text_pp, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { break; } @@ -940,7 +940,7 @@ qboolean BG_ParseConditions( char **text_pp, animScriptItem_t *scriptItem ) { case ANIM_CONDTYPE_VALUE: if ( animConditionsTable[conditionIndex].values ) { token = COM_ParseExt( text_pp, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { BG_AnimParseError( "BG_AnimParseAnimScript: expected condition value, found end of line" ); // RF modification break; } @@ -986,7 +986,7 @@ void BG_ParseCommands( char **input, animScriptItem_t *scriptItem, animModelInfo // parse the body part token = COM_ParseExt( input, ( partIndex < 1 ) ); - if ( !token || !token[0] ) { + if ( !token[0] ) { break; } if ( !Q_stricmp( token, "}" ) ) { @@ -1009,7 +1009,7 @@ void BG_ParseCommands( char **input, animScriptItem_t *scriptItem, animModelInfo if ( command->bodyPart[partIndex] > 0 ) { // parse the animation token = COM_ParseExt( input, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { BG_AnimParseError( "BG_ParseCommands: expected animation" ); } command->animIndex[partIndex] = BG_AnimationIndexForString( token, parseClient ); @@ -1029,7 +1029,7 @@ void BG_ParseCommands( char **input, animScriptItem_t *scriptItem, animModelInfo if ( !Q_stricmp( token, "duration" ) ) { // read the duration token = COM_ParseExt( input, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { BG_AnimParseError( "BG_ParseCommands: expected duration value" ); break; } @@ -1052,14 +1052,14 @@ void BG_ParseCommands( char **input, animScriptItem_t *scriptItem, animModelInfo // parse optional parameters (sounds, etc) while ( 1 ) { token = COM_ParseExt( input, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { break; } if ( !Q_stricmp( token, "sound" ) ) { token = COM_ParseExt( input, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { BG_AnimParseError( "BG_ParseCommands: expected sound" ); break; } @@ -1072,7 +1072,7 @@ void BG_ParseCommands( char **input, animScriptItem_t *scriptItem, animModelInfo //----(SA) added } else if ( !Q_stricmp( token, "showpart" ) ) { // show token = COM_ParseExt( input, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { BG_AnimParseError( "BG_ParseCommands: expected showpart number" ); break; } @@ -1083,7 +1083,7 @@ void BG_ParseCommands( char **input, animScriptItem_t *scriptItem, animModelInfo command->accShowBits &= atoi( token ); } else if ( !Q_stricmp( token, "hidepart" ) ) { token = COM_ParseExt( input, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { BG_AnimParseError( "BG_ParseCommands: expected hidepart number" ); break; } @@ -1174,7 +1174,7 @@ void BG_AnimParseAnimScript( animModelInfo_t *modelInfo, animScriptData_t *scrip while ( 1 ) { token = COM_Parse( &text_p ); - if ( !token || !token[0] ) { + if ( !token[0] ) { if ( indentLevel ) { BG_AnimParseError( "BG_AnimParseAnimScript: unexpected end of file: %s", token ); } @@ -1202,14 +1202,14 @@ void BG_AnimParseAnimScript( animModelInfo_t *modelInfo, animScriptData_t *scrip // read in the define type token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { BG_AnimParseError( "BG_AnimParseAnimScript: expected condition type string" ); // RF mod } defineType = BG_IndexForString( token, animConditionsStr, qfalse ); // read in the define token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { BG_AnimParseError( "BG_AnimParseAnimScript: expected condition define string" ); // RF mod } diff --git a/SP/code/game/g_client.c b/SP/code/game/g_client.c index 9656deb..266b04c 100644 --- a/SP/code/game/g_client.c +++ b/SP/code/game/g_client.c @@ -1998,7 +1998,7 @@ void G_RetrieveMoveSpeedsFromClient( int entnum, char *text ) { // get the model name token = COM_Parse( &text_p ); - if ( !token || !token[0] ) { + if ( !token[0] ) { G_Error( "G_RetrieveMoveSpeedsFromClient: internal error" ); } @@ -2011,7 +2011,7 @@ void G_RetrieveMoveSpeedsFromClient( int entnum, char *text ) { while ( 1 ) { token = COM_Parse( &text_p ); - if ( !token || !token[0] ) { + if ( !token[0] ) { break; } @@ -2023,14 +2023,14 @@ void G_RetrieveMoveSpeedsFromClient( int entnum, char *text ) { // get the movespeed token = COM_Parse( &text_p ); - if ( !token || !token[0] ) { + if ( !token[0] ) { G_Error( "G_RetrieveMoveSpeedsFromClient: missing movespeed" ); } anim->moveSpeed = atoi( token ); // get the stepgap token = COM_Parse( &text_p ); - if ( !token || !token[0] ) { + if ( !token[0] ) { G_Error( "G_RetrieveMoveSpeedsFromClient: missing stepGap" ); } anim->stepGap = atoi( token ); diff --git a/SP/code/game/g_script_actions.c b/SP/code/game/g_script_actions.c index 74a4a4b..c30d82a 100644 --- a/SP/code/game/g_script_actions.c +++ b/SP/code/game/g_script_actions.c @@ -497,7 +497,7 @@ qboolean G_ScriptAction_PlayAnim( gentity_t *ent, char *params ) { for ( i = 0; i < 2; i++ ) { token = COM_ParseExt( &pString, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { G_Printf( "G_Scripting: syntax error\n\nplayanim <startframe> <endframe> [LOOPING <duration>]\n" ); return qtrue; } else { @@ -515,7 +515,7 @@ qboolean G_ScriptAction_PlayAnim( gentity_t *ent, char *params ) { looping = qtrue; token = COM_ParseExt( &pString, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { G_Printf( "G_Scripting: syntax error\n\nplayanim <startframe> <endframe> [LOOPING <duration>]\n" ); return qtrue; } @@ -879,14 +879,14 @@ qboolean G_ScriptAction_FaceAngles( gentity_t *ent, char *params ) { pString = params; for ( i = 0; i < 3; i++ ) { token = COM_Parse( &pString ); - if ( !token || !token[0] ) { + if ( !token[0] ) { G_Error( "G_Scripting: syntax: faceangles <pitch> <yaw> <roll> <duration/GOTOTIME>\n" ); } angles[i] = atoi( token ); } token = COM_Parse( &pString ); - if ( !token || !token[0] ) { + if ( !token[0] ) { G_Error( "G_Scripting: faceangles requires a <pitch> <yaw> <roll> <duration/GOTOTIME>\n" ); } if ( !Q_strcasecmp( token, "gototime" ) ) { diff --git a/SP/code/ui/ui_main.c b/SP/code/ui/ui_main.c index 521e2c6..97c1c88 100644 --- a/SP/code/ui/ui_main.c +++ b/SP/code/ui/ui_main.c @@ -6203,7 +6203,7 @@ static qboolean Team_Parse(char **p) { return qtrue; } - if ( !token || token[0] == 0 ) { + if ( !token[0] ) { return qfalse; } @@ -6264,7 +6264,7 @@ static qboolean Character_Parse(char **p) { return qtrue; } - if ( !token || token[0] == 0 ) { + if ( !token[0] ) { return qfalse; } @@ -6317,7 +6317,7 @@ static qboolean Alias_Parse(char **p) { return qtrue; } - if ( !token || token[0] == 0 ) { + if ( !token[0] ) { return qfalse; } @@ -6367,7 +6367,7 @@ static void UI_ParseTeamInfo(const char *teamFile) { while ( 1 ) { token = COM_ParseExt( &p, qtrue ); - if( !token || token[0] == 0 || token[0] == '}') { + if( !token[0] || token[0] == '}') { break; } @@ -6424,7 +6424,7 @@ static qboolean GameType_Parse( char **p, qboolean join ) { return qtrue; } - if ( !token || token[0] == 0 ) { + if ( !token[0] ) { return qfalse; } @@ -6481,7 +6481,7 @@ static qboolean MapList_Parse( char **p ) { return qtrue; } - if ( !token || token[0] == 0 ) { + if ( !token[0] ) { return qfalse; } @@ -6542,7 +6542,7 @@ static void UI_ParseGameInfo( const char *teamFile ) { while ( 1 ) { token = COM_ParseExt( &p, qtrue ); - if ( !token || token[0] == 0 || token[0] == '}' ) { + if ( !token[0] || token[0] == '}' ) { break; } diff --git a/SP/code/ui/ui_players.c b/SP/code/ui/ui_players.c index eb4f4e3..9aaa138 100644 --- a/SP/code/ui/ui_players.c +++ b/SP/code/ui/ui_players.c @@ -1124,7 +1124,7 @@ static qboolean AnimParseAnimConfig( playerInfo_t *animModelInfo, const char *fi Q_strlwr( animations[i].name ); // token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { // BG_AnimParseError( "end of file without ENDANIMS" ); break; } @@ -1150,21 +1150,21 @@ static qboolean AnimParseAnimConfig( playerInfo_t *animModelInfo, const char *fi } token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { // BG_AnimParseError( "end of file without ENDANIMS" ); break; } animations[i].numFrames = atoi( token ); token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { // BG_AnimParseError( "end of file without ENDANIMS: line %i" ); break; } animations[i].loopFrames = atoi( token ); token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { // BG_AnimParseError( "end of file without ENDANIMS: line %i" ); break; } @@ -1177,7 +1177,7 @@ static qboolean AnimParseAnimConfig( playerInfo_t *animModelInfo, const char *fi // movespeed token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { // BG_AnimParseError( "end of file without ENDANIMS" ); break; } @@ -1226,14 +1226,14 @@ static qboolean AnimParseAnimConfig( playerInfo_t *animModelInfo, const char *fi for ( i = 0 ; i < MAX_HEAD_ANIMS ; i++ ) { token = COM_Parse( &text_p ); - if ( !token || !token[0] ) { + if ( !token[0] ) { break; } if ( animModelInfo->version > 1 ) { // includes animation names at start of each line // just throw this information away, not required for head token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { break; } } @@ -1247,7 +1247,7 @@ static qboolean AnimParseAnimConfig( playerInfo_t *animModelInfo, const char *fi headAnims[i].firstFrame -= animations[MAX_ANIMATIONS - 1].firstFrame + animations[MAX_ANIMATIONS - 1].numFrames + skip; token = COM_ParseExt( &text_p, qfalse ); - if ( !token || !token[0] ) { + if ( !token[0] ) { break; } headAnims[i].numFrames = atoi( token ); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits