This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag 1.42d in repository iortcw.
commit 1599fff36a0885b8006f6b4a1f95f60ddd047dc5 Author: [email protected] <[email protected]@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a> Date: Sun Jun 29 13:25:17 2014 +0000 All: Fix / clean up console output of scripting events --- MP/code/game/ai_cast_script_actions.c | 28 ++++++++++++++-------------- MP/code/game/g_script_actions.c | 2 +- SP/code/game/ai_cast_script_actions.c | 28 ++++++++++++++-------------- SP/code/game/g_script_actions.c | 2 +- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/MP/code/game/ai_cast_script_actions.c b/MP/code/game/ai_cast_script_actions.c index 31a856d..7a874f4 100644 --- a/MP/code/game/ai_cast_script_actions.c +++ b/MP/code/game/ai_cast_script_actions.c @@ -110,7 +110,7 @@ qboolean AICast_ScriptAction_GotoMarker( cast_state_t *cs, char *params ) { pString = params; token = COM_ParseExt( &pString, qfalse ); if ( !token[0] ) { - G_Error( "AI scripting: gotomarker must have an targetname\n" ); + G_Error( "AI Scripting: gotomarker must have an targetname\n" ); } // if we already are going to the marker, just use that, and check if we're in range @@ -188,7 +188,7 @@ qboolean AICast_ScriptAction_GotoMarker( cast_state_t *cs, char *params ) { } if ( !ent ) { - G_Error( "AI Scripting: can't find ai_marker with \"targetname\" = \"%s\"\n", token ); + G_Error( "AI Scripting: gotomarker can't find ai_marker with \"targetname\" = \"%s\"\n", token ); } if ( Distance( cs->bs->origin, ent->r.currentOrigin ) < SCRIPT_REACHGOAL_DIST ) { // we made it @@ -283,7 +283,7 @@ qboolean AICast_ScriptAction_GotoCast( cast_state_t *cs, char *params ) { pString = params; token = COM_ParseExt( &pString, qfalse ); if ( !token[0] ) { - G_Error( "AI scripting: gotocast must have an ainame\n" ); + G_Error( "AI Scripting: gotocast must have an ainame\n" ); } // if we already are going to the marker, just use that, and check if we're in range @@ -305,7 +305,7 @@ qboolean AICast_ScriptAction_GotoCast( cast_state_t *cs, char *params ) { if ( !ent ) { ent = AICast_FindEntityForName( token ); if ( !ent ) { - G_Error( "AI Scripting: gotomarker cannot find targetname \"%s\"\n", token ); + G_Error( "AI Scripting: gotocast cannot find targetname \"%s\"\n", token ); } } @@ -349,7 +349,7 @@ qboolean AICast_ScriptAction_GotoCast( cast_state_t *cs, char *params ) { // find the cast/player with the given "name" ent = AICast_FindEntityForName( token ); if ( !ent ) { - G_Error( "AI Scripting: can't find AI cast with \"ainame\" = \"%s\"\n", token ); + G_Error( "AI Scripting: gotocast can't find AI cast with \"ainame\" = \"%s\"\n", token ); } if ( Distance( cs->bs->origin, ent->r.currentOrigin ) < SCRIPT_REACHCAST_DIST ) { // we made it @@ -357,7 +357,7 @@ qboolean AICast_ScriptAction_GotoCast( cast_state_t *cs, char *params ) { } if ( !ent ) { - G_Error( "AI Scripting: can't find ai_marker with \"targetname\" = \"%s\"\n", token ); + G_Error( "AI Scripting: gotocast can't find ai_marker with \"targetname\" = \"%s\"\n", token ); } cs->castScriptStatus.scriptNoMoveTime = 0; @@ -448,7 +448,7 @@ qboolean AICast_ScriptAction_Wait( cast_state_t *cs, char *params ) { pString = params; token = COM_ParseExt( &pString, qfalse ); if ( !token[0] ) { - G_Error( "AI scripting: wait must have a duration\n" ); + G_Error( "AI Scripting: wait must have a duration\n" ); } if ( !Q_stricmp( token, "forever" ) ) { duration = level.time + 10000; @@ -556,7 +556,7 @@ qboolean AICast_ScriptAction_Trigger( cast_state_t *cs, char *params ) { pString = params; token = COM_ParseExt( &pString, qfalse ); if ( !token[0] ) { - G_Error( "AI scripting: trigger must have a name and an identifier\n" ); + G_Error( "AI Scripting: trigger must have a name and an identifier\n" ); } ent = AICast_FindEntityForName( token ); @@ -564,7 +564,7 @@ qboolean AICast_ScriptAction_Trigger( cast_state_t *cs, char *params ) { ent = G_Find( &g_entities[MAX_CLIENTS], FOFS( scriptName ), token ); if ( !ent ) { if ( trap_Cvar_VariableIntegerValue( "developer" ) ) { - G_Printf( "AI Scripting: can't find AI cast with \"ainame\" = \"%s\"\n", params ); + G_Printf( "AI Scripting: trigger can't find AI cast with \"ainame\" = \"%s\"\n", params ); } return qtrue; } @@ -572,7 +572,7 @@ qboolean AICast_ScriptAction_Trigger( cast_state_t *cs, char *params ) { token = COM_ParseExt( &pString, qfalse ); if ( !token[0] ) { - G_Error( "AI scripting: trigger must have a name and an identifier\n" ); + G_Error( "AI Scripting: trigger must have a name and an identifier\n" ); } oldId = cs->castScriptStatus.scriptId; @@ -599,7 +599,7 @@ qboolean AICast_ScriptAction_FollowCast( cast_state_t *cs, char *params ) { // find the cast/player with the given "name" ent = AICast_FindEntityForName( params ); if ( !ent ) { - G_Error( "AI Scripting: can't find AI cast with \"ainame\" = \"%s\"\n", params ); + G_Error( "AI Scripting: followcast can't find AI cast with \"ainame\" = \"%s\"\n", params ); } AIFunc_ChaseGoalStart( cs, ent->s.number, 64, qtrue ); @@ -1040,7 +1040,7 @@ qboolean AICast_ScriptAction_GiveArmor( cast_state_t *cs, char *params ) { } if ( !item ) { // item not found - G_Error( "AI Scripting: givearmor%s, unknown item", params ); + G_Error( "AI Scripting: givearmor %s, unknown item", params ); } if ( item->giType == IT_ARMOR ) { @@ -1741,7 +1741,7 @@ qboolean AICast_ScriptAction_FaceTargetAngles( cast_state_t *cs, char *params ) targetEnt = G_Find( NULL, FOFS( targetname ), params ); if ( !targetEnt ) { - G_Error( "AI Scripting: cannot find targetname \"%s\"\n", params ); + G_Error( "AI Scripting: facetargetangles cannot find targetname \"%s\"\n", params ); } VectorCopy( targetEnt->s.angles, cs->bs->ideal_viewangles ); @@ -1806,7 +1806,7 @@ qboolean AICast_ScriptAction_Mount( cast_state_t *cs, char *params ) { targetEnt = G_Find( NULL, FOFS( targetname ), params ); if ( !targetEnt ) { - G_Error( "AI Scripting: cannot find targetname \"%s\"\n", params ); + G_Error( "AI Scripting: mount cannot find targetname \"%s\"\n", params ); } VectorSubtract( targetEnt->r.currentOrigin, cs->bs->origin, vec ); diff --git a/MP/code/game/g_script_actions.c b/MP/code/game/g_script_actions.c index 4f16c07..c5f5ced 100644 --- a/MP/code/game/g_script_actions.c +++ b/MP/code/game/g_script_actions.c @@ -110,7 +110,7 @@ qboolean G_ScriptAction_GotoMarker( gentity_t *ent, char *params ) { target = G_Find( NULL, FOFS( targetname ), token ); if ( !target ) { - G_Error( "G_Scripting: can't find entity with \"targetname\" = \"%s\"\n", token ); + G_Error( "G_Scripting: gotomarker can't find entity with \"targetname\" = \"%s\"\n", token ); } VectorSubtract( target->r.currentOrigin, ent->r.currentOrigin, vec ); diff --git a/SP/code/game/ai_cast_script_actions.c b/SP/code/game/ai_cast_script_actions.c index f8dcf33..43c7a28 100644 --- a/SP/code/game/ai_cast_script_actions.c +++ b/SP/code/game/ai_cast_script_actions.c @@ -114,7 +114,7 @@ qboolean AICast_ScriptAction_GotoMarker( cast_state_t *cs, char *params ) { pString = params; token = COM_ParseExt( &pString, qfalse ); if ( !token[0] ) { - G_Error( "AI scripting: gotomarker must have an targetname\n" ); + G_Error( "AI Scripting: gotomarker must have an targetname\n" ); } // if we already are going to the marker, just use that, and check if we're in range @@ -198,7 +198,7 @@ qboolean AICast_ScriptAction_GotoMarker( cast_state_t *cs, char *params ) { } if ( !ent ) { - G_Error( "AI Scripting: can't find ai_marker with \"targetname\" = \"%s\"\n", token ); + G_Error( "AI Scripting: gotomarker can't find ai_marker with \"targetname\" = \"%s\"\n", token ); } if ( Distance( cs->bs->origin, ent->r.currentOrigin ) < SCRIPT_REACHGOAL_DIST ) { // we made it @@ -305,7 +305,7 @@ qboolean AICast_ScriptAction_GotoCast( cast_state_t *cs, char *params ) { pString = params; token = COM_ParseExt( &pString, qfalse ); if ( !token[0] ) { - G_Error( "AI scripting: gotocast must have an ainame\n" ); + G_Error( "AI Scripting: gotocast must have an ainame\n" ); } // if we already are going to the marker, just use that, and check if we're in range @@ -328,7 +328,7 @@ qboolean AICast_ScriptAction_GotoCast( cast_state_t *cs, char *params ) { if ( !ent ) { ent = AICast_FindEntityForName( token ); if ( !ent ) { - G_Error( "AI Scripting: gotomarker cannot find targetname \"%s\"\n", token ); + G_Error( "AI Scripting: gotocast cannot find targetname \"%s\"\n", token ); } } @@ -376,7 +376,7 @@ qboolean AICast_ScriptAction_GotoCast( cast_state_t *cs, char *params ) { // find the cast/player with the given "name" ent = AICast_FindEntityForName( token ); if ( !ent ) { - G_Error( "AI Scripting: can't find AI cast with \"ainame\" = \"%s\"\n", token ); + G_Error( "AI Scripting: gotocast can't find AI cast with \"ainame\" = \"%s\"\n", token ); } if ( Distance( cs->bs->origin, ent->r.currentOrigin ) < SCRIPT_REACHCAST_DIST ) { // we made it @@ -384,7 +384,7 @@ qboolean AICast_ScriptAction_GotoCast( cast_state_t *cs, char *params ) { } if ( !ent ) { - G_Error( "AI Scripting: can't find ai_marker with \"targetname\" = \"%s\"\n", token ); + G_Error( "AI Scripting: gotocast can't find ai_marker with \"targetname\" = \"%s\"\n", token ); } cs->castScriptStatus.scriptNoMoveTime = 0; @@ -507,7 +507,7 @@ qboolean AICast_ScriptAction_Wait( cast_state_t *cs, char *params ) { pString = params; token = COM_ParseExt( &pString, qfalse ); if ( !token[0] ) { - G_Error( "AI scripting: wait must have a duration\n" ); + G_Error( "AI Scripting: wait must have a duration\n" ); } if ( !Q_stricmp( token, "forever" ) ) { duration = level.time + 10000; @@ -616,7 +616,7 @@ qboolean AICast_ScriptAction_Trigger( cast_state_t *cs, char *params ) { pString = params; token = COM_ParseExt( &pString, qfalse ); if ( !token[0] ) { - G_Error( "AI scripting: trigger must have a name and an identifier\n" ); + G_Error( "AI Scripting: trigger must have a name and an identifier\n" ); } ent = AICast_FindEntityForName( token ); @@ -624,7 +624,7 @@ qboolean AICast_ScriptAction_Trigger( cast_state_t *cs, char *params ) { ent = G_Find( &g_entities[MAX_CLIENTS], FOFS( scriptName ), token ); if ( !ent ) { if ( trap_Cvar_VariableIntegerValue( "developer" ) ) { - G_Printf( "AI Scripting: can't find AI cast with \"ainame\" = \"%s\"\n", params ); + G_Printf( "AI Scripting: trigger can't find AI cast with \"ainame\" = \"%s\"\n", params ); } return qtrue; } @@ -632,7 +632,7 @@ qboolean AICast_ScriptAction_Trigger( cast_state_t *cs, char *params ) { token = COM_ParseExt( &pString, qfalse ); if ( !token[0] ) { - G_Error( "AI scripting: trigger must have a name and an identifier\n" ); + G_Error( "AI Scripting: trigger must have a name and an identifier\n" ); } oldId = cs->castScriptStatus.scriptId; @@ -659,7 +659,7 @@ qboolean AICast_ScriptAction_FollowCast( cast_state_t *cs, char *params ) { // find the cast/player with the given "name" ent = AICast_FindEntityForName( params ); if ( !ent ) { - G_Error( "AI Scripting: can't find AI cast with \"ainame\" = \"%s\"\n", params ); + G_Error( "AI Scripting: followcast can't find AI cast with \"ainame\" = \"%s\"\n", params ); } AIFunc_ChaseGoalStart( cs, ent->s.number, 64, qtrue ); @@ -1277,7 +1277,7 @@ qboolean AICast_ScriptAction_GiveArmor( cast_state_t *cs, char *params ) { } if ( !item ) { // item not found - G_Error( "AI Scripting: givearmor%s, unknown item", params ); + G_Error( "AI Scripting: givearmor %s, unknown item", params ); } if ( item->giType == IT_ARMOR ) { @@ -2077,7 +2077,7 @@ qboolean AICast_ScriptAction_FaceTargetAngles( cast_state_t *cs, char *params ) targetEnt = G_Find( NULL, FOFS( targetname ), params ); if ( !targetEnt ) { - G_Error( "AI Scripting: cannot find targetname \"%s\"\n", params ); + G_Error( "AI Scripting: facetargetangles cannot find targetname \"%s\"\n", params ); } VectorCopy( targetEnt->s.angles, cs->ideal_viewangles ); @@ -2147,7 +2147,7 @@ qboolean AICast_ScriptAction_Mount( cast_state_t *cs, char *params ) { targetEnt = G_Find( NULL, FOFS( targetname ), params ); if ( !targetEnt ) { - G_Error( "AI Scripting: cannot find targetname \"%s\"\n", params ); + G_Error( "AI Scripting: mount cannot find targetname \"%s\"\n", params ); } VectorSubtract( targetEnt->r.currentOrigin, cs->bs->origin, vec ); diff --git a/SP/code/game/g_script_actions.c b/SP/code/game/g_script_actions.c index 8350d52..525e964 100644 --- a/SP/code/game/g_script_actions.c +++ b/SP/code/game/g_script_actions.c @@ -110,7 +110,7 @@ qboolean G_ScriptAction_GotoMarker( gentity_t *ent, char *params ) { target = G_Find( NULL, FOFS( targetname ), token ); if ( !target ) { - G_Error( "G_Scripting: can't find entity with \"targetname\" = \"%s\"\n", token ); + G_Error( "G_Scripting: gotomarker can't find entity with \"targetname\" = \"%s\"\n", token ); } VectorSubtract( target->r.currentOrigin, ent->r.currentOrigin, vec ); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
