diff options
Diffstat (limited to 'src/cgame/cg_consolecmds.c')
| -rw-r--r-- | src/cgame/cg_consolecmds.c | 245 |
1 files changed, 101 insertions, 144 deletions
diff --git a/src/cgame/cg_consolecmds.c b/src/cgame/cg_consolecmds.c index c53ee166..43c78675 100644 --- a/src/cgame/cg_consolecmds.c +++ b/src/cgame/cg_consolecmds.c @@ -20,14 +20,14 @@ -void CG_TargetCommand_f( void ) { +void CG_TargetCommand_f( void ) +{ int targetNum; - char test[4]; + char test[ 4 ]; - targetNum = CG_CrosshairPlayer(); - if (!targetNum ) { + targetNum = CG_CrosshairPlayer( ); + if( !targetNum ) return; - } trap_Argv( 1, test, 4 ); trap_SendConsoleCommand( va( "gc %i %i", targetNum, atoi( test ) ) ); @@ -42,8 +42,9 @@ CG_SizeUp_f Keybinding command ================= */ -static void CG_SizeUp_f (void) { - trap_Cvar_Set("cg_viewsize", va("%i",(int)(cg_viewsize.integer+10))); +static void CG_SizeUp_f( void ) +{ + trap_Cvar_Set( "cg_viewsize", va( "%i", (int)( cg_viewsize.integer + 10 ) ) ); } @@ -54,8 +55,9 @@ CG_SizeDown_f Keybinding command ================= */ -static void CG_SizeDown_f (void) { - trap_Cvar_Set("cg_viewsize", va("%i",(int)(cg_viewsize.integer-10))); +static void CG_SizeDown_f( void ) +{ + trap_Cvar_Set( "cg_viewsize", va( "%i", (int)( cg_viewsize.integer - 10 ) ) ); } @@ -66,15 +68,18 @@ CG_Viewpos_f Debugging command to print the current position ============= */ -static void CG_Viewpos_f (void) { - CG_Printf ("(%i %i %i) : %i\n", (int)cg.refdef.vieworg[0], - (int)cg.refdef.vieworg[1], (int)cg.refdef.vieworg[2], - (int)cg.refdefViewAngles[YAW]); +static void CG_Viewpos_f( void ) +{ + CG_Printf( "(%i %i %i) : %i\n", (int)cg.refdef.vieworg[ 0 ], + (int)cg.refdef.vieworg[ 1 ], (int)cg.refdef.vieworg[ 2 ], + (int)cg.refdefViewAngles[ YAW ] ); } -static void CG_ScoresDown_f( void ) { - if ( cg.scoresRequestTime + 2000 < cg.time ) { +static void CG_ScoresDown_f( void ) +{ + if( cg.scoresRequestTime + 2000 < cg.time ) + { // the scores are more than two seconds out of data, // so request new ones cg.scoresRequestTime = cg.time; @@ -82,108 +87,59 @@ static void CG_ScoresDown_f( void ) { // leave the current scores up if they were already // displayed, but if this is the first hit, clear them out - if ( !cg.showScores ) { + if( !cg.showScores ) + { cg.showScores = qtrue; cg.numScores = 0; } - } else { + } + else + { // show the cached contents even if they just pressed if it // is within two seconds cg.showScores = qtrue; } } -static void CG_ScoresUp_f( void ) { - if ( cg.showScores ) { +static void CG_ScoresUp_f( void ) +{ + if( cg.showScores ) + { cg.showScores = qfalse; cg.scoreFadeTime = cg.time; } } -static void CG_TellTarget_f( void ) { +static void CG_TellTarget_f( void ) +{ int clientNum; - char command[128]; - char message[128]; + char command[ 128 ]; + char message[ 128 ]; - clientNum = CG_CrosshairPlayer(); - if ( clientNum == -1 ) { + clientNum = CG_CrosshairPlayer( ); + if( clientNum == -1 ) return; - } trap_Args( message, 128 ); Com_sprintf( command, 128, "tell %i %s", clientNum, message ); trap_SendClientCommand( command ); } -static void CG_TellAttacker_f( void ) { +static void CG_TellAttacker_f( void ) +{ int clientNum; - char command[128]; - char message[128]; + char command[ 128 ]; + char message[ 128 ]; - clientNum = CG_LastAttacker(); - if ( clientNum == -1 ) { + clientNum = CG_LastAttacker( ); + if( clientNum == -1 ) return; - } trap_Args( message, 128 ); Com_sprintf( command, 128, "tell %i %s", clientNum, message ); trap_SendClientCommand( command ); } -static void CG_VoiceTellTarget_f( void ) { - int clientNum; - char command[128]; - char message[128]; - - clientNum = CG_CrosshairPlayer(); - if ( clientNum == -1 ) { - return; - } - - trap_Args( message, 128 ); - Com_sprintf( command, 128, "vtell %i %s", clientNum, message ); - trap_SendClientCommand( command ); -} - -static void CG_VoiceTellAttacker_f( void ) { - int clientNum; - char command[128]; - char message[128]; - - clientNum = CG_LastAttacker(); - if ( clientNum == -1 ) { - return; - } - - trap_Args( message, 128 ); - Com_sprintf( command, 128, "vtell %i %s", clientNum, message ); - trap_SendClientCommand( command ); -} - -/* -================== -CG_StartOrbit_f -================== -*/ - -static void CG_StartOrbit_f( void ) { - char var[MAX_TOKEN_CHARS]; - - trap_Cvar_VariableStringBuffer( "developer", var, sizeof( var ) ); - if ( !atoi(var) ) { - return; - } - if (cg_cameraOrbit.value != 0) { - trap_Cvar_Set("cg_cameraOrbit", "0"); - trap_Cvar_Set("cg_thirdPerson", "0"); - } else { - trap_Cvar_Set("cg_cameraOrbit", "5"); - trap_Cvar_Set("cg_thirdPerson", "1"); - trap_Cvar_Set("cg_thirdPersonAngle", "0"); - trap_Cvar_Set("cg_thirdPersonRange", "100"); - } -} - /* ================== CG_DecodeMP3_f @@ -194,7 +150,7 @@ void CG_DecodeMP3_f( void ) char mp3file[ MAX_QPATH ]; char wavfile[ MAX_QPATH ]; - if( trap_Argc() < 2 ) + if( trap_Argc( ) < 2 ) { CG_Printf( "usage: decodeMP3 <mp3file> <wavfile>\n" ); return; @@ -206,12 +162,14 @@ void CG_DecodeMP3_f( void ) S_decodeMP3( mp3file, wavfile ); } -typedef struct { +typedef struct +{ char *cmd; - void (*function)(void); + void (*function)( void ); } consoleCommand_t; -static consoleCommand_t commands[] = { +static consoleCommand_t commands[ ] = +{ { "testgun", CG_TestGun_f }, { "testmodel", CG_TestModel_f }, { "nextframe", CG_TestModelNextFrame_f }, @@ -230,10 +188,7 @@ static consoleCommand_t commands[] = { { "weapon", CG_Weapon_f }, { "tell_target", CG_TellTarget_f }, { "tell_attacker", CG_TellAttacker_f }, - { "vtell_target", CG_VoiceTellTarget_f }, - { "vtell_attacker", CG_VoiceTellAttacker_f }, { "tcmd", CG_TargetCommand_f }, - { "startOrbit", CG_StartOrbit_f }, { "decodeMP3", CG_DecodeMP3_f }, { "loaddeferred", CG_LoadDeferredPlayers } }; @@ -247,12 +202,13 @@ The string has been tokenized and can be retrieved with Cmd_Argc() / Cmd_Argv() ================= */ -qboolean CG_ConsoleCommand( void ) { +qboolean CG_ConsoleCommand( void ) +{ const char *cmd; const char *arg1; - int i; + int i; - cmd = CG_Argv(0); + cmd = CG_Argv( 0 ); //TA: ugly hacky special case if( !Q_stricmp( cmd, "ui_menu" ) ) @@ -262,9 +218,11 @@ qboolean CG_ConsoleCommand( void ) { return qtrue; } - for ( i = 0 ; i < sizeof( commands ) / sizeof( commands[0] ) ; i++ ) { - if ( !Q_stricmp( cmd, commands[i].cmd ) ) { - commands[i].function(); + for( i = 0; i < sizeof( commands ) / sizeof( commands[ 0 ] ); i++ ) + { + if( !Q_stricmp( cmd, commands[ i ].cmd ) ) + { + commands[ i ].function( ); return qtrue; } } @@ -281,57 +239,56 @@ Let the client system know about all of our commands so it can perform tab completion ================= */ -void CG_InitConsoleCommands( void ) { +void CG_InitConsoleCommands( void ) +{ int i; - for ( i = 0 ; i < sizeof( commands ) / sizeof( commands[0] ) ; i++ ) { - trap_AddCommand( commands[i].cmd ); - } + for( i = 0 ; i < sizeof( commands ) / sizeof( commands[ 0 ] ) ; i++ ) + trap_AddCommand( commands[ i ].cmd ); // // the game server will interpret these commands, which will be automatically // forwarded to the server after they are not recognized locally // - trap_AddCommand ("kill"); - trap_AddCommand ("say"); - trap_AddCommand ("say_team"); - trap_AddCommand ("tell"); - trap_AddCommand ("vsay"); - trap_AddCommand ("vsay_team"); - trap_AddCommand ("vtell"); - trap_AddCommand ("vtaunt"); - trap_AddCommand ("vosay"); - trap_AddCommand ("vosay_team"); - trap_AddCommand ("votell"); - trap_AddCommand ("give"); - trap_AddCommand ("god"); - trap_AddCommand ("notarget"); - trap_AddCommand ("noclip"); - trap_AddCommand ("team"); - trap_AddCommand ("follow"); - trap_AddCommand ("levelshot"); - trap_AddCommand ("addbot"); - trap_AddCommand ("setviewpos"); - trap_AddCommand ("callvote"); - trap_AddCommand ("vote"); - trap_AddCommand ("callteamvote"); - trap_AddCommand ("teamvote"); - trap_AddCommand ("stats"); - trap_AddCommand ("teamtask"); - trap_AddCommand ("class"); - trap_AddCommand ("build"); - trap_AddCommand ("buy"); - trap_AddCommand ("sell"); - trap_AddCommand ("deposit"); - trap_AddCommand ("withdraw"); - trap_AddCommand ("spawnbody"); - trap_AddCommand ("itemact"); - trap_AddCommand ("itemdeact"); - trap_AddCommand ("itemtoggle"); - trap_AddCommand ("destroy"); - trap_AddCommand ("deconstruct"); - trap_AddCommand ("torch"); - trap_AddCommand ("menu"); - trap_AddCommand ("ui_menu"); - trap_AddCommand ("loaddefered"); // spelled wrong, but not changing for demo + trap_AddCommand( "kill" ); + trap_AddCommand( "say" ); + trap_AddCommand( "say_team" ); + trap_AddCommand( "tell" ); + trap_AddCommand( "vsay" ); + trap_AddCommand( "vsay_team" ); + trap_AddCommand( "vtell" ); + trap_AddCommand( "vtaunt" ); + trap_AddCommand( "vosay" ); + trap_AddCommand( "vosay_team" ); + trap_AddCommand( "votell" ); + trap_AddCommand( "give" ); + trap_AddCommand( "god" ); + trap_AddCommand( "notarget" ); + trap_AddCommand( "noclip" ); + trap_AddCommand( "team" ); + trap_AddCommand( "follow" ); + trap_AddCommand( "levelshot" ); + trap_AddCommand( "addbot" ); + trap_AddCommand( "setviewpos" ); + trap_AddCommand( "callvote" ); + trap_AddCommand( "vote" ); + trap_AddCommand( "callteamvote" ); + trap_AddCommand( "teamvote" ); + trap_AddCommand( "stats" ); + trap_AddCommand( "teamtask" ); + trap_AddCommand( "class" ); + trap_AddCommand( "build" ); + trap_AddCommand( "buy" ); + trap_AddCommand( "sell" ); + trap_AddCommand( "deposit" ); + trap_AddCommand( "withdraw" ); + trap_AddCommand( "spawnbody" ); + trap_AddCommand( "itemact" ); + trap_AddCommand( "itemdeact" ); + trap_AddCommand( "itemtoggle" ); + trap_AddCommand( "destroy" ); + trap_AddCommand( "deconstruct" ); + trap_AddCommand( "menu" ); + trap_AddCommand( "ui_menu" ); + trap_AddCommand( "loaddefered" ); // spelled wrong, but not changing for demo } |