mirror of
https://github.com/ioquake/ioq3.git
synced 2025-05-30 00:20:59 +00:00
Cleanups from pomac!
This commit is contained in:
Zachary Slater
parent
b0fc4a7b6e
commit
f327407bb8
36 changed files with 155 additions and 195 deletions
|
|
@ -211,7 +211,7 @@ void UI_ClearScores() {
|
|||
|
||||
|
||||
|
||||
static void UI_Cache_f() {
|
||||
static void UI_Cache_f( void ) {
|
||||
Display_CacheAll();
|
||||
}
|
||||
|
||||
|
|
@ -220,7 +220,7 @@ static void UI_Cache_f() {
|
|||
UI_CalcPostGameStats
|
||||
=======================
|
||||
*/
|
||||
static void UI_CalcPostGameStats() {
|
||||
static void UI_CalcPostGameStats( void ) {
|
||||
char map[MAX_QPATH];
|
||||
char fileName[MAX_QPATH];
|
||||
char info[MAX_INFO_STRING];
|
||||
|
|
|
|||
|
|
@ -352,13 +352,13 @@ extern sfxHandle_t MenuField_Key( menufield_s* m, int* key );
|
|||
//
|
||||
// ui_main.c
|
||||
//
|
||||
void UI_Report();
|
||||
void UI_Load();
|
||||
void UI_Report( void );
|
||||
void UI_Load( void );
|
||||
void UI_LoadMenus(const char *menuFile, qboolean reset);
|
||||
void _UI_SetActiveMenu( uiMenuCommand_t menu );
|
||||
int UI_AdjustTimeByGame(int time);
|
||||
void UI_ShowPostGame(qboolean newHigh);
|
||||
void UI_ClearScores();
|
||||
void UI_ClearScores( void );
|
||||
void UI_LoadArenas(void);
|
||||
|
||||
//
|
||||
|
|
@ -972,8 +972,8 @@ int trap_LAN_GetPingQueueCount( void );
|
|||
void trap_LAN_ClearPing( int n );
|
||||
void trap_LAN_GetPing( int n, char *buf, int buflen, int *pingtime );
|
||||
void trap_LAN_GetPingInfo( int n, char *buf, int buflen );
|
||||
void trap_LAN_LoadCachedServers();
|
||||
void trap_LAN_SaveCachedServers();
|
||||
void trap_LAN_LoadCachedServers( void );
|
||||
void trap_LAN_SaveCachedServers( void );
|
||||
void trap_LAN_MarkServerVisible(int source, int n, qboolean visible);
|
||||
int trap_LAN_ServerIsVisible( int source, int n);
|
||||
qboolean trap_LAN_UpdateVisiblePings( int source );
|
||||
|
|
|
|||
|
|
@ -213,7 +213,7 @@ long vmMain( long command, long arg0, long arg1, long arg2, long arg3, long arg4
|
|||
|
||||
|
||||
|
||||
void AssetCache() {
|
||||
void AssetCache( void ) {
|
||||
int n;
|
||||
//if (Assets.textFont == NULL) {
|
||||
//}
|
||||
|
|
@ -845,7 +845,7 @@ qboolean Asset_Parse(int handle) {
|
|||
return qfalse;
|
||||
}
|
||||
|
||||
void Font_Report() {
|
||||
void Font_Report( void ) {
|
||||
int i;
|
||||
Com_Printf("Font Info\n");
|
||||
Com_Printf("=========\n");
|
||||
|
|
@ -854,7 +854,7 @@ void Font_Report() {
|
|||
}
|
||||
}
|
||||
|
||||
void UI_Report() {
|
||||
void UI_Report( void ) {
|
||||
String_Report();
|
||||
//Font_Report();
|
||||
|
||||
|
|
@ -1506,7 +1506,7 @@ static void UI_DrawOpponent(rectDef_t *rect) {
|
|||
|
||||
}
|
||||
|
||||
static void UI_NextOpponent() {
|
||||
static void UI_NextOpponent( void ) {
|
||||
int i = UI_TeamIndexFromName(UI_Cvar_VariableString("ui_opponentName"));
|
||||
int j = UI_TeamIndexFromName(UI_Cvar_VariableString("ui_teamName"));
|
||||
i++;
|
||||
|
|
@ -1522,7 +1522,7 @@ static void UI_NextOpponent() {
|
|||
trap_Cvar_Set( "ui_opponentName", uiInfo.teamList[i].teamName );
|
||||
}
|
||||
|
||||
static void UI_PriorOpponent() {
|
||||
static void UI_PriorOpponent( void ) {
|
||||
int i = UI_TeamIndexFromName(UI_Cvar_VariableString("ui_opponentName"));
|
||||
int j = UI_TeamIndexFromName(UI_Cvar_VariableString("ui_teamName"));
|
||||
i--;
|
||||
|
|
@ -1787,7 +1787,7 @@ static void UI_DrawCrosshair(rectDef_t *rect, float scale, vec4_t color) {
|
|||
UI_BuildPlayerList
|
||||
===============
|
||||
*/
|
||||
static void UI_BuildPlayerList() {
|
||||
static void UI_BuildPlayerList( void ) {
|
||||
uiClientState_t cs;
|
||||
int n, count, team, team2, playerTeamNumber;
|
||||
char info[MAX_INFO_STRING];
|
||||
|
|
@ -2813,7 +2813,7 @@ static void UI_StartSinglePlayer() {
|
|||
UI_LoadMods
|
||||
===============
|
||||
*/
|
||||
static void UI_LoadMods() {
|
||||
static void UI_LoadMods( void ) {
|
||||
int numdirs;
|
||||
char dirlist[2048];
|
||||
char *dirptr;
|
||||
|
|
@ -2844,7 +2844,7 @@ static void UI_LoadMods() {
|
|||
UI_LoadTeams
|
||||
===============
|
||||
*/
|
||||
static void UI_LoadTeams() {
|
||||
static void UI_LoadTeams( void ) {
|
||||
char teamList[4096];
|
||||
char *teamName;
|
||||
int i, len, count;
|
||||
|
|
@ -2868,7 +2868,7 @@ static void UI_LoadTeams() {
|
|||
UI_LoadMovies
|
||||
===============
|
||||
*/
|
||||
static void UI_LoadMovies() {
|
||||
static void UI_LoadMovies( void ) {
|
||||
char movielist[4096];
|
||||
char *moviename;
|
||||
int i, len;
|
||||
|
|
@ -2900,7 +2900,7 @@ static void UI_LoadMovies() {
|
|||
UI_LoadDemos
|
||||
===============
|
||||
*/
|
||||
static void UI_LoadDemos() {
|
||||
static void UI_LoadDemos( void ) {
|
||||
char demolist[4096];
|
||||
char demoExt[32];
|
||||
char *demoname;
|
||||
|
|
@ -4270,7 +4270,7 @@ static int UI_GetIndexFromSelection(int actual) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void UI_UpdatePendingPings() {
|
||||
static void UI_UpdatePendingPings( void ) {
|
||||
trap_LAN_ResetPings(ui_netSource.integer);
|
||||
uiInfo.serverStatus.refreshActive = qtrue;
|
||||
uiInfo.serverStatus.refreshtime = uiInfo.uiDC.realTime + 1000;
|
||||
|
|
@ -5222,7 +5222,7 @@ void _UI_MouseEvent( int dx, int dy )
|
|||
|
||||
}
|
||||
|
||||
void UI_LoadNonIngame() {
|
||||
void UI_LoadNonIngame( void ) {
|
||||
const char *menuSet = UI_Cvar_VariableString("ui_menuFiles");
|
||||
if (menuSet == NULL || menuSet[0] == '\0') {
|
||||
menuSet = "ui/menus.txt";
|
||||
|
|
|
|||
|
|
@ -2513,7 +2513,7 @@ static void Menu_CloseCinematics(menuDef_t *menu) {
|
|||
}
|
||||
}
|
||||
|
||||
static void Display_CloseCinematics() {
|
||||
static void Display_CloseCinematics( void ) {
|
||||
int i;
|
||||
for (i = 0; i < menuCount; i++) {
|
||||
Menu_CloseCinematics(&Menus[i]);
|
||||
|
|
@ -2537,7 +2537,7 @@ void Menus_Activate(menuDef_t *menu) {
|
|||
|
||||
}
|
||||
|
||||
int Display_VisibleMenuCount() {
|
||||
int Display_VisibleMenuCount( void ) {
|
||||
int i, count;
|
||||
count = 0;
|
||||
for (i = 0; i < menuCount; i++) {
|
||||
|
|
|
|||
|
|
@ -329,7 +329,7 @@ typedef struct {
|
|||
void (*drawRect) ( float x, float y, float w, float h, float size, const vec4_t color);
|
||||
void (*drawSides) (float x, float y, float w, float h, float size);
|
||||
void (*drawTopBottom) (float x, float y, float w, float h, float size);
|
||||
void (*clearScene) ();
|
||||
void (*clearScene) ( void );
|
||||
void (*addRefEntityToScene) (const refEntity_t *re );
|
||||
void (*renderScene) ( const refdef_t *fd );
|
||||
void (*registerFont) (const char *pFontname, int pointSize, fontInfo_t *font);
|
||||
|
|
@ -343,7 +343,7 @@ typedef struct {
|
|||
void (*setCVar)(const char *cvar, const char *value);
|
||||
void (*drawTextWithCursor)(float x, float y, float scale, vec4_t color, const char *text, int cursorPos, char cursor, int limit, int style);
|
||||
void (*setOverstrikeMode)(qboolean b);
|
||||
qboolean (*getOverstrikeMode)();
|
||||
qboolean (*getOverstrikeMode)( void );
|
||||
void (*startLocalSound)( sfxHandle_t sfx, int channelNum );
|
||||
qboolean (*ownerDrawHandleKey)(int ownerDraw, int flags, float *special, int key);
|
||||
int (*feederCount)(float feederID);
|
||||
|
|
@ -360,7 +360,7 @@ typedef struct {
|
|||
int (*ownerDrawWidth)(int ownerDraw, float scale);
|
||||
sfxHandle_t (*registerSound)(const char *name, qboolean compressed);
|
||||
void (*startBackgroundTrack)( const char *intro, const char *loop);
|
||||
void (*stopBackgroundTrack)();
|
||||
void (*stopBackgroundTrack)( void );
|
||||
int (*playCinematic)(const char *name, float x, float y, float w, float h);
|
||||
void (*stopCinematic)(int handle);
|
||||
void (*drawCinematic)(int handle, float x, float y, float w, float h);
|
||||
|
|
@ -386,14 +386,14 @@ typedef struct {
|
|||
} displayContextDef_t;
|
||||
|
||||
const char *String_Alloc(const char *p);
|
||||
void String_Init();
|
||||
void String_Report();
|
||||
void String_Init( void );
|
||||
void String_Report( void );
|
||||
void Init_Display(displayContextDef_t *dc);
|
||||
void Display_ExpandMacros(char * buff);
|
||||
void Menu_Init(menuDef_t *menu);
|
||||
void Item_Init(itemDef_t *item);
|
||||
void Menu_PostParse(menuDef_t *menu);
|
||||
menuDef_t *Menu_GetFocused();
|
||||
menuDef_t *Menu_GetFocused( void );
|
||||
void Menu_HandleKey(menuDef_t *menu, int key, qboolean down);
|
||||
void Menu_HandleMouseMove(menuDef_t *menu, float x, float y);
|
||||
void Menu_ScrollFeeder(menuDef_t *menu, int feeder, qboolean down);
|
||||
|
|
@ -409,33 +409,33 @@ qboolean PC_Int_Parse(int handle, int *i);
|
|||
qboolean PC_Rect_Parse(int handle, rectDef_t *r);
|
||||
qboolean PC_String_Parse(int handle, const char **out);
|
||||
qboolean PC_Script_Parse(int handle, const char **out);
|
||||
int Menu_Count();
|
||||
int Menu_Count( void );
|
||||
void Menu_New(int handle);
|
||||
void Menu_PaintAll();
|
||||
void Menu_PaintAll( void );
|
||||
menuDef_t *Menus_ActivateByName(const char *p);
|
||||
void Menu_Reset();
|
||||
qboolean Menus_AnyFullScreenVisible();
|
||||
void Menu_Reset( void );
|
||||
qboolean Menus_AnyFullScreenVisible( void );
|
||||
void Menus_Activate(menuDef_t *menu);
|
||||
|
||||
displayContextDef_t *Display_GetContext();
|
||||
displayContextDef_t *Display_GetContext( void );
|
||||
void *Display_CaptureItem(int x, int y);
|
||||
qboolean Display_MouseMove(void *p, int x, int y);
|
||||
int Display_CursorType(int x, int y);
|
||||
qboolean Display_KeyBindPending();
|
||||
qboolean Display_KeyBindPending( void );
|
||||
void Menus_OpenByName(const char *p);
|
||||
menuDef_t *Menus_FindByName(const char *p);
|
||||
void Menus_ShowByName(const char *p);
|
||||
void Menus_CloseByName(const char *p);
|
||||
void Display_HandleKey(int key, qboolean down, int x, int y);
|
||||
void LerpColor(vec4_t a, vec4_t b, vec4_t c, float t);
|
||||
void Menus_CloseAll();
|
||||
void Menus_CloseAll( void );
|
||||
void Menu_Paint(menuDef_t *menu, qboolean forcePaint);
|
||||
void Menu_SetFeederSelection(menuDef_t *menu, int feeder, int index, const char *name);
|
||||
void Display_CacheAll();
|
||||
void Display_CacheAll( void );
|
||||
|
||||
void *UI_Alloc( int size );
|
||||
void UI_InitMemory( void );
|
||||
qboolean UI_OutOfMemory();
|
||||
qboolean UI_OutOfMemory( void );
|
||||
|
||||
void Controls_GetConfig( void );
|
||||
void Controls_SetConfig(qboolean restart);
|
||||
|
|
|
|||
|
|
@ -266,11 +266,11 @@ int trap_LAN_ServerStatus( const char *serverAddress, char *serverStatus, int ma
|
|||
return syscall( UI_LAN_SERVERSTATUS, serverAddress, serverStatus, maxLen );
|
||||
}
|
||||
|
||||
void trap_LAN_SaveCachedServers() {
|
||||
void trap_LAN_SaveCachedServers( void ) {
|
||||
syscall( UI_LAN_SAVECACHEDSERVERS );
|
||||
}
|
||||
|
||||
void trap_LAN_LoadCachedServers() {
|
||||
void trap_LAN_LoadCachedServers( void ) {
|
||||
syscall( UI_LAN_LOADCACHEDSERVERS );
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue