ubergames/ioef
0
0
Fork 0
mirror of https://github.com/UberGames/ioef.git synced 2024-11-30 16:01:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

REFACTOR

Browse source 
From /dev/humancontroller.
This commit is contained in:
Zack Middleton 2012-06-18 16:27:00 +00:00
parent 997615168a
commit 7f9a04fd80
6 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/cgame/cg_event.c
View file

@ -1066,13 +1066,13 @@ void CG_EntityEvent( centity_t *cent, vec3_t position ) {
if (cg.snap->ps.powerups[PW_BLUEFLAG] || cg.snap->ps.powerups[PW_NEUTRALFLAG]) { if (cg.snap->ps.powerups[PW_BLUEFLAG] || cg.snap->ps.powerups[PW_NEUTRALFLAG]) {
} }
else { else {
if (cgs.clientinfo[cg.clientNum].team == TEAM_BLUE) { if (cgs.clientinfo[cg.clientNum].team == TEAM_BLUE) {
#ifdef MISSIONPACK #ifdef MISSIONPACK
if (cgs.gametype == GT_1FCTF) if (cgs.gametype == GT_1FCTF)
CG_AddBufferedSound( cgs.media.yourTeamTookTheFlagSound ); CG_AddBufferedSound( cgs.media.yourTeamTookTheFlagSound );
else else
#endif #endif
CG_AddBufferedSound( cgs.media.enemyTookYourFlagSound ); CG_AddBufferedSound( cgs.media.enemyTookYourFlagSound );
} }
else if (cgs.clientinfo[cg.clientNum].team == TEAM_RED) { else if (cgs.clientinfo[cg.clientNum].team == TEAM_RED) {
#ifdef MISSIONPACK #ifdef MISSIONPACK

1
code/game/ai_dmq3.c
View file

@ -2301,7 +2301,6 @@ int BotWantsToRetreat(bot_state_t *bs) {
#endif #endif
// //
if (bs->enemy >= 0) { if (bs->enemy >= 0) {
//if the enemy is carrying a flag
BotEntityInfo(bs->enemy, &entinfo); BotEntityInfo(bs->enemy, &entinfo);
// if the enemy is carrying a flag // if the enemy is carrying a flag
if (EntityCarriesFlag(&entinfo)) return qfalse; if (EntityCarriesFlag(&entinfo)) return qfalse;

2
code/game/g_spawn.c
View file

@ -485,7 +485,7 @@ char *G_AddSpawnVarToken( const char *string ) {
l = strlen( string ); l = strlen( string );
if ( level.numSpawnVarChars + l + 1 > MAX_SPAWN_VARS_CHARS ) { if ( level.numSpawnVarChars + l + 1 > MAX_SPAWN_VARS_CHARS ) {
G_Error( "G_AddSpawnVarToken: MAX_SPAWN_VARS" ); G_Error( "G_AddSpawnVarToken: MAX_SPAWN_VARS_CHARS" );
} }
dest = level.spawnVarChars + level.numSpawnVarChars; dest = level.spawnVarChars + level.numSpawnVarChars;

2
code/game/g_syscalls.c
View file

@ -48,6 +48,7 @@ void trap_Printf( const char *fmt ) {
void trap_Error(const char *fmt) void trap_Error(const char *fmt)
{ {
syscall(G_ERROR, fmt); syscall(G_ERROR, fmt);
// shut up GCC warning about returning functions, because we know better
exit(1); exit(1);
} }
@ -227,7 +228,6 @@ int trap_RealTime( qtime_t *qtime ) {
void trap_SnapVector( float *v ) { void trap_SnapVector( float *v ) {
syscall( G_SNAPVECTOR, v ); syscall( G_SNAPVECTOR, v );
return;
} }
// BotLib traps start here // BotLib traps start here

1
code/ui/ui_main.c
View file

@ -5108,7 +5108,6 @@ void _UI_Init( qboolean inGameLoad ) {
uiInfo.uiDC.drawSides = &_UI_DrawSides; uiInfo.uiDC.drawSides = &_UI_DrawSides;
uiInfo.uiDC.drawTopBottom = &_UI_DrawTopBottom; uiInfo.uiDC.drawTopBottom = &_UI_DrawTopBottom;
uiInfo.uiDC.clearScene = &trap_R_ClearScene; uiInfo.uiDC.clearScene = &trap_R_ClearScene;
uiInfo.uiDC.drawSides = &_UI_DrawSides;
uiInfo.uiDC.addRefEntityToScene = &trap_R_AddRefEntityToScene; uiInfo.uiDC.addRefEntityToScene = &trap_R_AddRefEntityToScene;
uiInfo.uiDC.renderScene = &trap_R_RenderScene; uiInfo.uiDC.renderScene = &trap_R_RenderScene;
uiInfo.uiDC.registerFont = &trap_R_RegisterFont; uiInfo.uiDC.registerFont = &trap_R_RegisterFont;

1
code/ui/ui_syscalls.c
View file

@ -47,6 +47,7 @@ void trap_Print( const char *string ) {
void trap_Error(const char *string) void trap_Error(const char *string)
{ {
syscall(UI_ERROR, string); syscall(UI_ERROR, string);
// shut up GCC warning about returning functions, because we know better
exit(1); exit(1);
} }