From 122fe646235067bae2a620f877a6d76af067d7f3 Mon Sep 17 00:00:00 2001 From: zakk Date: Fri, 2 Sep 2005 20:13:47 +0000 Subject: Cleanups from pomac! git-svn-id: svn://svn.icculus.org/quake3/trunk@67 edf5b092-35ff-0310-97b2-ce42778d08ea --- code/cgame/cg_consolecmds.c | 2 +- code/cgame/cg_draw.c | 6 +++--- code/cgame/cg_local.h | 24 ++++++++++++------------ code/cgame/cg_main.c | 4 ++-- code/cgame/cg_newdraw.c | 12 ++++++------ 5 files changed, 24 insertions(+), 24 deletions(-) (limited to 'code/cgame') diff --git a/code/cgame/cg_consolecmds.c b/code/cgame/cg_consolecmds.c index 584ebd4..06c8d19 100644 --- a/code/cgame/cg_consolecmds.c +++ b/code/cgame/cg_consolecmds.c @@ -117,7 +117,7 @@ static void CG_ScoresUp_f( void ) { #ifdef MISSIONPACK extern menuDef_t *menuScoreboard; -void Menu_Reset(); // FIXME: add to right include file +void Menu_Reset( void ); // FIXME: add to right include file static void CG_LoadHud_f( void) { char buff[1024]; diff --git a/code/cgame/cg_draw.c b/code/cgame/cg_draw.c index 5575aaf..3de07b8 100644 --- a/code/cgame/cg_draw.c +++ b/code/cgame/cg_draw.c @@ -2135,7 +2135,7 @@ static void CG_DrawTeamVote(void) { } -static qboolean CG_DrawScoreboard() { +static qboolean CG_DrawScoreboard( void ) { #ifdef MISSIONPACK static qboolean firstTime = qtrue; float fade, *fadeColor; @@ -2475,7 +2475,7 @@ static void CG_DrawWarmup( void ) { CG_DrawTimedMenus ================= */ -void CG_DrawTimedMenus() { +void CG_DrawTimedMenus( void ) { if (cg.voiceTime) { int t = cg.time - cg.voiceTime; if ( t > 2500 ) { @@ -2587,7 +2587,7 @@ static void CG_Draw2D( void ) { } -static void CG_DrawTourneyScoreboard() { +static void CG_DrawTourneyScoreboard( void ) { #ifdef MISSIONPACK #else CG_DrawOldTourneyScoreboard(); diff --git a/code/cgame/cg_local.h b/code/cgame/cg_local.h index a23f715..27ec4fc 100644 --- a/code/cgame/cg_local.h +++ b/code/cgame/cg_local.h @@ -1205,8 +1205,8 @@ void CG_MouseEvent(int x, int y); void CG_EventHandling(int type); void CG_RankRunFrame( void ); void CG_SetScoreSelection(void *menu); -score_t *CG_GetSelectedScore(); -void CG_BuildSpectatorString(); +score_t *CG_GetSelectedScore( void ); +void CG_BuildSpectatorString( void ); // @@ -1277,23 +1277,23 @@ void CG_OwnerDraw(float x, float y, float w, float h, float text_x, float text_y void CG_Text_Paint(float x, float y, float scale, vec4_t color, const char *text, float adjust, int limit, int style); int CG_Text_Width(const char *text, float scale, int limit); int CG_Text_Height(const char *text, float scale, int limit); -void CG_SelectPrevPlayer(); -void CG_SelectNextPlayer(); +void CG_SelectPrevPlayer( void ); +void CG_SelectNextPlayer( void ); float CG_GetValue(int ownerDraw); qboolean CG_OwnerDrawVisible(int flags); void CG_RunMenuScript(char **args); -void CG_ShowResponseHead(); +void CG_ShowResponseHead( void ); void CG_SetPrintString(int type, const char *p); -void CG_InitTeamChat(); +void CG_InitTeamChat( void ); void CG_GetTeamColor(vec4_t *color); -const char *CG_GetGameStatusText(); -const char *CG_GetKillerText(); +const char *CG_GetGameStatusText( void ); +const char *CG_GetKillerText( void ); void CG_Draw3DModel( float x, float y, float w, float h, qhandle_t model, qhandle_t skin, vec3_t origin, vec3_t angles ); void CG_Text_PaintChar(float x, float y, float width, float height, float scale, float s, float t, float s2, float t2, qhandle_t hShader); -void CG_CheckOrderPending(); -const char *CG_GameTypeString(); -qboolean CG_YourTeamHasFlag(); -qboolean CG_OtherTeamHasFlag(); +void CG_CheckOrderPending( void ); +const char *CG_GameTypeString( void ); +qboolean CG_YourTeamHasFlag( void ); +qboolean CG_OtherTeamHasFlag( void ); qhandle_t CG_StatusHandle(int task); diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c index f8d423c..03a4994 100644 --- a/code/cgame/cg_main.c +++ b/code/cgame/cg_main.c @@ -1756,7 +1756,7 @@ CG_LoadHudMenu(); ================= */ -void CG_LoadHudMenu() { +void CG_LoadHudMenu( void ) { char buff[1024]; const char *hudSet; @@ -1823,7 +1823,7 @@ void CG_LoadHudMenu() { CG_LoadMenus(hudSet); } -void CG_AssetCache() { +void CG_AssetCache( void ) { //if (Assets.textFont == NULL) { // trap_R_RegisterFont("fonts/arial.ttf", 72, &Assets.textFont); //} diff --git a/code/cgame/cg_newdraw.c b/code/cgame/cg_newdraw.c index c78fff9..de82465 100644 --- a/code/cgame/cg_newdraw.c +++ b/code/cgame/cg_newdraw.c @@ -119,7 +119,7 @@ void CG_CheckOrderPending() { } } -static void CG_SetSelectedPlayerName() { +static void CG_SetSelectedPlayerName( void ) { if (cg_currentSelectedPlayer.integer >= 0 && cg_currentSelectedPlayer.integer < numSortedTeamPlayers) { clientInfo_t *ci = cgs.clientinfo + sortedTeamPlayers[cg_currentSelectedPlayer.integer]; if (ci) { @@ -131,14 +131,14 @@ static void CG_SetSelectedPlayerName() { trap_Cvar_Set("cg_selectedPlayerName", "Everyone"); } } -int CG_GetSelectedPlayer() { +int CG_GetSelectedPlayer( void ) { if (cg_currentSelectedPlayer.integer < 0 || cg_currentSelectedPlayer.integer >= numSortedTeamPlayers) { cg_currentSelectedPlayer.integer = 0; } return cg_currentSelectedPlayer.integer; } -void CG_SelectNextPlayer() { +void CG_SelectNextPlayer( void ) { CG_CheckOrderPending(); if (cg_currentSelectedPlayer.integer >= 0 && cg_currentSelectedPlayer.integer < numSortedTeamPlayers) { cg_currentSelectedPlayer.integer++; @@ -148,7 +148,7 @@ void CG_SelectNextPlayer() { CG_SetSelectedPlayerName(); } -void CG_SelectPrevPlayer() { +void CG_SelectPrevPlayer( void ) { CG_CheckOrderPending(); if (cg_currentSelectedPlayer.integer > 0 && cg_currentSelectedPlayer.integer < numSortedTeamPlayers) { cg_currentSelectedPlayer.integer--; @@ -1743,7 +1743,7 @@ CG_HideTeamMenus ================== */ -void CG_HideTeamMenu() { +void CG_HideTeamMenu( void ) { Menus_CloseByName("teamMenu"); Menus_CloseByName("getMenu"); } @@ -1754,7 +1754,7 @@ CG_ShowTeamMenus ================== */ -void CG_ShowTeamMenu() { +void CG_ShowTeamMenu( void ) { Menus_OpenByName("teamMenu"); } -- cgit v1.2.3