mirror of
https://github.com/ReactionQuake3/reaction.git
synced 2024-11-26 22:21:16 +00:00
warning cleanups
This commit is contained in:
Scott Brooks
parent
a95e29e3a4
commit
0046a49560
19 changed files with 111 additions and 109 deletions
|
|
@ -36,7 +36,7 @@ ifndef BUILD_SERVER
|
|||
BUILD_SERVER = 1
|
||||
endif
|
||||
ifndef BUILD_GAME_SO
|
||||
BUILD_GAME_SO = 0
|
||||
BUILD_GAME_SO = 1
|
||||
endif
|
||||
ifndef BUILD_GAME_QVM
|
||||
BUILD_GAME_QVM = 1
|
||||
|
|
|
|||
|
|
@ -433,7 +433,7 @@ static void CG_SnowParticleRender(cg_atmosphericParticle_t * particle)
|
|||
** Set up gust parameters.
|
||||
*/
|
||||
|
||||
static void CG_EffectGust()
|
||||
static void CG_EffectGust( void )
|
||||
{
|
||||
// Generate random values for the next gust
|
||||
|
||||
|
|
|
|||
|
|
@ -2278,7 +2278,7 @@ static void CG_DrawTeamVote(void)
|
|||
SMALLCHAR_WIDTH, SMALLCHAR_HEIGHT, 100);
|
||||
}
|
||||
|
||||
static qboolean CG_DrawScoreboard()
|
||||
static qboolean CG_DrawScoreboard( void )
|
||||
{
|
||||
return CG_DrawOldScoreboard();
|
||||
}
|
||||
|
|
@ -2605,7 +2605,7 @@ static void CG_Draw2D(void)
|
|||
CG_DrawWeaponStats();
|
||||
}
|
||||
|
||||
static void CG_DrawTourneyScoreboard()
|
||||
static void CG_DrawTourneyScoreboard( void )
|
||||
{
|
||||
CG_DrawOldTourneyScoreboard();
|
||||
}
|
||||
|
|
@ -2620,7 +2620,7 @@ Makro - changed to 0..1 instead of 0/1
|
|||
*/
|
||||
#define MAX_DAMAGE_ALPHA 0.75
|
||||
#define MAX_BLEND_TIME 1500
|
||||
static void CG_DrawDamageBlend()
|
||||
static void CG_DrawDamageBlend( void )
|
||||
{
|
||||
float dmg, blend = Com_Clamp(0, 1, cg_RQ3_painblend.value);
|
||||
vec4_t damageColor;
|
||||
|
|
@ -2670,7 +2670,7 @@ Makro: fade to black after death
|
|||
=====================
|
||||
*/
|
||||
|
||||
static void CG_DrawDeathBlend()
|
||||
static void CG_DrawDeathBlend( void )
|
||||
{
|
||||
const float MAX_ALPHA = 0.875f;
|
||||
float delta;
|
||||
|
|
|
|||
|
|
@ -2075,8 +2075,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 );
|
||||
|
||||
void CG_ReplaceModels(void);
|
||||
|
||||
|
|
@ -2084,8 +2084,8 @@ void CG_ReplaceModels(void);
|
|||
// cg_atmospheric.c
|
||||
//
|
||||
void CG_EffectParse( const char *effectstr );
|
||||
void CG_AddAtmosphericEffects();
|
||||
qboolean CG_AtmosphericKludge();
|
||||
void CG_AddAtmosphericEffects( void );
|
||||
qboolean CG_AtmosphericKludge( void );
|
||||
|
||||
//
|
||||
// cg_view.c
|
||||
|
|
@ -2158,24 +2158,24 @@ 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);
|
||||
|
||||
//
|
||||
|
|
@ -2249,11 +2249,11 @@ void CG_PrevWeapon_f(void);
|
|||
void CG_SpecialWeapon_f(void);
|
||||
|
||||
void CG_RQ3_SyncZoom(void);
|
||||
void CG_RQ3_SaveZoomLevel();
|
||||
void CG_RQ3_SaveZoomLevel( void );
|
||||
//void CG_RQ3_Zoom(void); //Elder: just threw it in
|
||||
//void CG_RQ3_Zoom1x();
|
||||
int CG_RQ3_GetGrenadeMode();
|
||||
void CG_RQ3_GrenadeMode();
|
||||
//void CG_RQ3_Zoom1x( void );
|
||||
int CG_RQ3_GetGrenadeMode( void );
|
||||
void CG_RQ3_GrenadeMode( void );
|
||||
|
||||
void CG_RegisterWeapon(int weaponNum);
|
||||
void CG_RegisterItemVisuals(int itemNum);
|
||||
|
|
@ -2275,7 +2275,7 @@ void CG_DrawWeaponSelect(void);
|
|||
void CG_Tracer(vec3_t source, vec3_t dest);
|
||||
|
||||
void CG_OutOfAmmoChange(void); // should this be in pmove?
|
||||
void CG_CheckLaser(); //Elder: check laser to see if it's our own
|
||||
void CG_CheckLaser( void ); //Elder: check laser to see if it's our own
|
||||
|
||||
//
|
||||
// cg_marks.c
|
||||
|
|
|
|||
|
|
@ -1042,7 +1042,7 @@ This is one attempt to update the team count cvars for the UI, each time
|
|||
a player changes it's userinfo ( team, name, etc )
|
||||
|
||||
*/
|
||||
void CG_UpdateTeamVars()
|
||||
void CG_UpdateTeamVars( void )
|
||||
{
|
||||
clientInfo_t *ci;
|
||||
int i;
|
||||
|
|
|
|||
|
|
@ -1381,7 +1381,7 @@ CG_RQ3_Cmd by sLiCeR
|
|||
This function will parse and handle several cmds in one ( rq3_cmd)
|
||||
=================
|
||||
*/
|
||||
void CG_RQ3_Cmd()
|
||||
void CG_RQ3_Cmd( void )
|
||||
{
|
||||
int cmd, i;
|
||||
char scrnshotName[MAX_QPATH], playerName[MAX_NAME_LENGTH];
|
||||
|
|
|
|||
|
|
@ -440,7 +440,7 @@ void CG_PositionRotatedEntityOnTag(refEntity_t * entity, const refEntity_t * par
|
|||
MatrixMultiply(tempAxis, ((refEntity_t *) parent)->axis, entity->axis);
|
||||
}
|
||||
*/
|
||||
static void CG_DeadPlayerView()
|
||||
static void CG_DeadPlayerView( void )
|
||||
{
|
||||
if (cg.renderingThirdPerson || 0 != (cg.snap->ps.eFlags & EF_HEADLESS))
|
||||
{
|
||||
|
|
@ -660,7 +660,7 @@ Returns a FOV based on the current zoom state
|
|||
====================
|
||||
*/
|
||||
|
||||
static int CG_RQ3_GetFov()
|
||||
static int CG_RQ3_GetFov( void )
|
||||
{
|
||||
if ((cg.zoomLevel & RQ3_ZOOM_LOW) == RQ3_ZOOM_LOW && (cg.zoomLevel & RQ3_ZOOM_MED) == RQ3_ZOOM_MED)
|
||||
return 10;
|
||||
|
|
@ -680,7 +680,7 @@ Returns a FOV based on the last zoom state
|
|||
====================
|
||||
*/
|
||||
|
||||
static int CG_RQ3_GetLastFov()
|
||||
static int CG_RQ3_GetLastFov( void )
|
||||
{
|
||||
if ((cg.lastZoomLevel & RQ3_ZOOM_LOW) == RQ3_ZOOM_LOW && (cg.lastZoomLevel & RQ3_ZOOM_MED) == RQ3_ZOOM_MED)
|
||||
return 10;
|
||||
|
|
|
|||
|
|
@ -3333,7 +3333,7 @@ Elder:
|
|||
Local laser dot if it is the client's own laser
|
||||
==================
|
||||
*/
|
||||
static void CG_LocalLaser()
|
||||
static void CG_LocalLaser( void )
|
||||
{
|
||||
vec3_t muzzle, forward, end;
|
||||
refEntity_t *re;
|
||||
|
|
|
|||
|
|
@ -90,6 +90,7 @@ int strcmp( const char *string1, const char *string2 );
|
|||
char *strchr( const char *string, int c );
|
||||
char *strstr( const char *string, const char *strCharSet );
|
||||
char *strncpy( char *strDest, const char *strSource, size_t count );
|
||||
char *strtok( char *s, const char *delim);
|
||||
int tolower( int c );
|
||||
int toupper( int c );
|
||||
|
||||
|
|
|
|||
|
|
@ -633,7 +633,7 @@ void Cmd_WeaponStats_f(gentity_t * ent)
|
|||
ent->client->pers.records[REC_SUICIDES]));
|
||||
|
||||
trap_SendServerCommand(ent - g_entities,
|
||||
va("wstats2 %i %i %i %i %i %i %i %i %i %i %i %i %i %i %i %i %i %i %i %i %i %i %i",
|
||||
va("wstats2 %i %i %i %i %i %i %i %i %i %i %i %i %i %i %i %i %i %i %i %i %i %i",
|
||||
ent->client->pers.records[REC_KNIFETHROWDEATHS],
|
||||
ent->client->pers.records[REC_KNIFETHROWKILLS],
|
||||
ent->client->pers.records[REC_KNIFESLASHDEATHS],
|
||||
|
|
@ -2606,7 +2606,7 @@ void Cmd_Bandage(gentity_t * ent)
|
|||
void Cmd_OpenDoor(gentity_t * ent)
|
||||
{
|
||||
//Use_BinaryMover( ent->parent, ent, other );
|
||||
gentity_t *door = NULL;
|
||||
// gentity_t *door = NULL;
|
||||
|
||||
//Don't open doors if dead or spectating
|
||||
if (ent->client->ps.stats[STAT_HEALTH] <= 0 || ent->client->ps.pm_type == PM_SPECTATOR)
|
||||
|
|
|
|||
|
|
@ -1134,7 +1134,7 @@ void G_AddPredictableEvent(gentity_t * ent, int event, int eventParm);
|
|||
void G_AddEvent(gentity_t * ent, int event, int eventParm);
|
||||
void G_SetOrigin(gentity_t * ent, vec3_t origin);
|
||||
void AddRemap(const char *oldShader, const char *newShader, float timeOffset);
|
||||
const char *BuildShaderStateConfig();
|
||||
const char *BuildShaderStateConfig( void );
|
||||
|
||||
//
|
||||
// g_combat.c
|
||||
|
|
|
|||
|
|
@ -954,7 +954,7 @@ void G_FindTeams(void)
|
|||
G_Printf("%i teams with %i entities\n", c, c2);
|
||||
}
|
||||
|
||||
void G_RemapTeamShaders()
|
||||
void G_RemapTeamShaders( void )
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -1171,7 +1171,7 @@ void RQ3_loadmodels(void)
|
|||
}
|
||||
|
||||
//Makro - FIXME: add comments
|
||||
void G_InitMoveParents()
|
||||
void G_InitMoveParents( void )
|
||||
{
|
||||
int i;
|
||||
level.num_moveParents = 0;
|
||||
|
|
@ -1239,7 +1239,7 @@ void G_InitMoveParents()
|
|||
}
|
||||
|
||||
//Makro - determine moveparent order
|
||||
void G_SetMoveParentOrder()
|
||||
void G_SetMoveParentOrder( void )
|
||||
{
|
||||
int i, j;
|
||||
char info[MAX_INFO_STRING], *p;
|
||||
|
|
@ -2168,7 +2168,7 @@ void LogExit(const char *string)
|
|||
trap_SendServerCommand(-1,
|
||||
va("print \"Game ending at %s %i %s %i %i:%i:%i.\n\"", names_day[now.tm_wday],
|
||||
now.tm_mday, names_month[now.tm_mon], (now.tm_year) + 1900, now.tm_hour, now.tm_min,
|
||||
now.tm_sec, string));
|
||||
now.tm_sec));
|
||||
|
||||
level.intermissionQueued = level.time;
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ gentity_t *refVotes[2]; // refVotes[0] is the clientnumber red team voted
|
|||
|
||||
// refVotes[1] is the clientnumber blue team voted
|
||||
|
||||
void SendEndMessage()
|
||||
void SendEndMessage( void )
|
||||
{
|
||||
|
||||
int mins, secs;
|
||||
|
|
@ -34,7 +34,7 @@ void SendEndMessage()
|
|||
trap_SendServerCommand(-1, va("print \"Total Match Time: %d:%02d \n\"", mins, secs));
|
||||
}
|
||||
|
||||
int getNumberOfRefs() {
|
||||
int getNumberOfRefs( void ) {
|
||||
gentity_t *ent;
|
||||
int i,count;
|
||||
count = 0;
|
||||
|
|
@ -329,7 +329,7 @@ void MM_TeamName_f(gentity_t * ent)
|
|||
// aasimon: Referee Functions Definition, with some aid functions first
|
||||
//
|
||||
|
||||
void checkRefVotes()
|
||||
void checkRefVotes( void )
|
||||
{
|
||||
// gentity_t *ent;
|
||||
// char nr[4];
|
||||
|
|
@ -501,7 +501,7 @@ qboolean Ref_Auth(gentity_t * ent)
|
|||
// MM_ResetMatch by Slicer
|
||||
// Used by admin or rcon to reset Match settings, that is subs, captains, scores, teams's status and game status
|
||||
//
|
||||
void MM_ResetMatch() {
|
||||
void MM_ResetMatch( void ) {
|
||||
trap_SendServerCommand(-1, va("print \""MM_OK_COLOR" Reseting Server Match Status...\n\""));
|
||||
// CleanUp Scores and Team Status
|
||||
MM_ClearScores(qtrue);
|
||||
|
|
@ -516,7 +516,7 @@ void MM_ResetMatch() {
|
|||
level.matchTime = 0;
|
||||
}
|
||||
|
||||
void refReadyStatus() {
|
||||
void refReadyStatus( void ) {
|
||||
gentity_t *ent;
|
||||
int i;
|
||||
|
||||
|
|
|
|||
|
|
@ -32,8 +32,8 @@ void MM_TeamName_f(gentity_t *);
|
|||
void MM_TeamModel_f(gentity_t *);
|
||||
void MM_Referee_f(gentity_t *);
|
||||
void MM_Settings_f(gentity_t *);
|
||||
void SendEndMessage();
|
||||
void MM_ResetMatch();
|
||||
void SendEndMessage( void );
|
||||
void MM_ResetMatch( void );
|
||||
|
||||
// aasimon: Declarations for Ref system
|
||||
qboolean Ref_Exists(void);
|
||||
|
|
|
|||
|
|
@ -301,12 +301,15 @@ void use_dlight(gentity_t * ent, gentity_t * other, gentity_t * activator)
|
|||
}
|
||||
}
|
||||
ent->unbreakable ^= 1;
|
||||
if (other)
|
||||
if (other->pathtarget)
|
||||
if (!Q_stricmp(other->pathtarget, "off"))
|
||||
if (other) {
|
||||
if (other->pathtarget) {
|
||||
if (!Q_stricmp(other->pathtarget, "off")) {
|
||||
ent->unbreakable = 0;
|
||||
else if (!Q_stricmp(other->pathtarget, "on"))
|
||||
} else if (!Q_stricmp(other->pathtarget, "on")) {
|
||||
ent->unbreakable = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (ent->unbreakable) {
|
||||
ent->r.svFlags |= SVF_NOCLIENT;
|
||||
|
|
|
|||
|
|
@ -89,17 +89,17 @@ typedef struct {
|
|||
} spawn_distances_t;
|
||||
|
||||
|
||||
void CheckTeamRules();
|
||||
void StartLCA();
|
||||
void ContinueLCA();
|
||||
qboolean BothTeamsHavePlayers();
|
||||
void MakeAllLivePlayersObservers();
|
||||
int CheckForWinner();
|
||||
int CheckForForcedWinner();
|
||||
void CheckTeamRules( void );
|
||||
void StartLCA( void );
|
||||
void ContinueLCA( void );
|
||||
qboolean BothTeamsHavePlayers( void );
|
||||
void MakeAllLivePlayersObservers( void );
|
||||
int CheckForWinner( void );
|
||||
int CheckForForcedWinner( void );
|
||||
int WonGame(int winner);
|
||||
team_t RQ3TeamCount(int ignoreClientNum, int team);
|
||||
void SpawnPlayers();
|
||||
void CleanLevel();
|
||||
void SpawnPlayers( void );
|
||||
void CleanLevel( void );
|
||||
void CheckForUnevenTeams(gentity_t * player);
|
||||
void EquipPlayer(gentity_t * ent);
|
||||
void RQ3_Cmd_Choose_f(gentity_t * ent);
|
||||
|
|
|
|||
|
|
@ -492,16 +492,16 @@ 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);
|
||||
//Makro - added
|
||||
void UI_BuildIngameServerInfoList();
|
||||
void UI_BuildIngameServerInfoList( void );
|
||||
|
||||
//
|
||||
// ui_menu.c
|
||||
|
|
@ -747,7 +747,7 @@ typedef struct {
|
|||
} uiStatic_t;
|
||||
|
||||
//Makro - added
|
||||
qboolean UI_RQ3_WeaponMenuAccess();
|
||||
qboolean UI_RQ3_WeaponMenuAccess( void );
|
||||
|
||||
// new ui stuff
|
||||
#define UI_NUMFX 7
|
||||
|
|
@ -1169,8 +1169,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);
|
||||
|
|
|
|||
|
|
@ -585,7 +585,7 @@ static void DefineSymbol(fileHandle_t f, const char* name, const char* value)
|
|||
}
|
||||
|
||||
|
||||
static void UI_ExportSymbols()
|
||||
static void UI_ExportSymbols( void )
|
||||
{
|
||||
// Makro - this is a hack that allows us to export resolution-dependent symbols to the scripts.
|
||||
// We could call trap_PC_AddGlobalDefine, but there's no undefine function...
|
||||
|
|
@ -615,10 +615,10 @@ static void UI_ExportSymbols()
|
|||
trap_FS_FCloseFile(f);
|
||||
}
|
||||
else
|
||||
Com_Error(ERR_FATAL, "Could not create temporary UI symbol file!\n", fname);
|
||||
Com_Error(ERR_FATAL, "Could not create temporary UI symbol file!: %s\n", fname);
|
||||
}
|
||||
|
||||
static void UI_CleanUpSymbols()
|
||||
static void UI_CleanUpSymbols( void )
|
||||
{
|
||||
fileHandle_t f;
|
||||
const char* fname = s_symbols_temp_file_name;
|
||||
|
|
@ -637,7 +637,7 @@ qhandle_t Asset_RegisterShaderNoMip(const char *path)
|
|||
return trap_R_RegisterShaderNoMip(va("%s/%s", uiInfo.uiDC.Assets.assetsPath, path));
|
||||
}
|
||||
|
||||
void AssetCache()
|
||||
void AssetCache( void )
|
||||
{
|
||||
int n, ssg;
|
||||
|
||||
|
|
@ -1453,7 +1453,7 @@ void UI_ShowPostGame(qboolean newHigh)
|
|||
|
||||
|
||||
//Makro - added
|
||||
int GMemory();
|
||||
int GMemory( void );
|
||||
|
||||
/*
|
||||
=================
|
||||
|
|
@ -1462,7 +1462,7 @@ _UI_Refresh
|
|||
*/
|
||||
//Makro - need this variable here; moved from line ~1585
|
||||
static qboolean updateModel = qtrue;
|
||||
qboolean UI_NeedToUpdateModel()
|
||||
qboolean UI_NeedToUpdateModel( void )
|
||||
{
|
||||
return updateModel;
|
||||
}
|
||||
|
|
@ -1895,7 +1895,7 @@ qboolean Asset_Parse(int handle)
|
|||
//return qfalse;
|
||||
}
|
||||
|
||||
void Font_Report()
|
||||
void Font_Report( void )
|
||||
{
|
||||
int i;
|
||||
|
||||
|
|
@ -1906,7 +1906,7 @@ void Font_Report()
|
|||
}
|
||||
}
|
||||
|
||||
void UI_Report()
|
||||
void UI_Report( void )
|
||||
{
|
||||
String_Report();
|
||||
//Font_Report();
|
||||
|
|
@ -2003,8 +2003,7 @@ void UI_LoadMenus(const char *menuFile, qboolean reset)
|
|||
handle = trap_PC_LoadSource("ui/menus.txt");
|
||||
if (!handle) {
|
||||
trap_Error(va
|
||||
(S_COLOR_RED "default menu file not found: ui/menus.txt, unable to continue!\n",
|
||||
menuFile));
|
||||
(S_COLOR_RED "default menu file not found: ui/menus.txt, unable to continue!\n"));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2039,7 +2038,7 @@ void UI_LoadMenus(const char *menuFile, qboolean reset)
|
|||
trap_PC_FreeSource(handle);
|
||||
}
|
||||
|
||||
void UI_Load()
|
||||
void UI_Load( void )
|
||||
{
|
||||
char lastName[1024];
|
||||
menuDef_t *menu = Menu_GetFocused();
|
||||
|
|
@ -2413,7 +2412,7 @@ static weapon_t RQ3_UI_weapon = WP_PISTOL;
|
|||
|
||||
//Makro - use different animations for the player model depending on ui_RQ3_modelCommand
|
||||
|
||||
animNumber_t UI_RQ3_GetAnimForLegs()
|
||||
animNumber_t UI_RQ3_GetAnimForLegs( void )
|
||||
{
|
||||
int cmd = (int) trap_Cvar_VariableValue("ui_RQ3_modelCommand");
|
||||
|
||||
|
|
@ -2447,7 +2446,7 @@ animNumber_t UI_RQ3_GetAnimForLegs()
|
|||
|
||||
//Makro - use different animations for the player model depending on ui_RQ3_modelCommand
|
||||
|
||||
animNumber_t UI_RQ3_GetAnimForTorso()
|
||||
animNumber_t UI_RQ3_GetAnimForTorso( void )
|
||||
{
|
||||
int cmd = (int) trap_Cvar_VariableValue("ui_RQ3_modelCommand");
|
||||
|
||||
|
|
@ -2463,7 +2462,7 @@ animNumber_t UI_RQ3_GetAnimForTorso()
|
|||
|
||||
//Makro - use different weapons for the player model depending on ui_RQ3_model_command
|
||||
|
||||
weapon_t UI_RQ3_GetWeaponForPlayer()
|
||||
weapon_t UI_RQ3_GetWeaponForPlayer( void )
|
||||
{
|
||||
int cmd = (int) trap_Cvar_VariableValue("ui_RQ3_modelCommand");
|
||||
|
||||
|
|
@ -2787,7 +2786,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"));
|
||||
|
|
@ -2805,7 +2804,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"));
|
||||
|
|
@ -3156,7 +3155,6 @@ static void UI_DrawCrosshair(rectDef_t * rect, float scale)
|
|||
//Makro - digital clock
|
||||
static void UI_DrawClock(itemDef_t *item, rectDef_t * rect, float scale, vec4_t color, int textStyle)
|
||||
{
|
||||
int time = uiInfo.uiDC.realTime;
|
||||
char *text;
|
||||
qtime_t qt;
|
||||
|
||||
|
|
@ -3231,7 +3229,7 @@ void AddIngameLine(char *key, char *val)
|
|||
}
|
||||
}
|
||||
|
||||
void UI_BuildIngameServerInfoList()
|
||||
void UI_BuildIngameServerInfoList( void )
|
||||
{
|
||||
char serverInfo[MAX_INFO_STRING], systemInfo[MAX_INFO_STRING];
|
||||
char *p, *key, *val;
|
||||
|
|
@ -3559,7 +3557,7 @@ void UI_LoadReplacement(int index)
|
|||
UI_BuildPlayerList
|
||||
===============
|
||||
*/
|
||||
static void UI_BuildPlayerList()
|
||||
static void UI_BuildPlayerList( void )
|
||||
{
|
||||
uiClientState_t cs;
|
||||
int n, count, team, team2, playerTeamNumber;
|
||||
|
|
@ -5197,7 +5195,7 @@ static void UI_StartSinglePlayer() {
|
|||
UI_LoadMods
|
||||
===============
|
||||
*/
|
||||
static void UI_LoadMods()
|
||||
static void UI_LoadMods( void )
|
||||
{
|
||||
int numdirs;
|
||||
char dirlist[2048];
|
||||
|
|
@ -5228,7 +5226,7 @@ static void UI_LoadMods()
|
|||
UI_LoadTeams
|
||||
===============
|
||||
*/
|
||||
static void UI_LoadTeams()
|
||||
static void UI_LoadTeams( void )
|
||||
{
|
||||
char teamList[4096];
|
||||
char *teamName;
|
||||
|
|
@ -5252,7 +5250,7 @@ static void UI_LoadTeams()
|
|||
UI_LoadMovies
|
||||
===============
|
||||
*/
|
||||
static void UI_LoadMovies()
|
||||
static void UI_LoadMovies( void )
|
||||
{
|
||||
char movielist[4096];
|
||||
char *moviename;
|
||||
|
|
@ -5342,7 +5340,7 @@ void UI_SortDemoList(int start, int end, int column)
|
|||
}
|
||||
}
|
||||
|
||||
static void UI_LoadDemos()
|
||||
static void UI_LoadDemos( void )
|
||||
{
|
||||
char demolist[4096];
|
||||
char demoExt[32];
|
||||
|
|
@ -7257,7 +7255,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;
|
||||
|
|
@ -8168,7 +8166,7 @@ void UI_RenderScene(const refdef_t *ref)
|
|||
trap_R_ClearScene();
|
||||
}
|
||||
|
||||
void UI_Render2DScene()
|
||||
void UI_Render2DScene( void )
|
||||
{
|
||||
if (uiInfo.uiDC.pendingPolys == 0)
|
||||
return;
|
||||
|
|
@ -8176,7 +8174,7 @@ void UI_Render2DScene()
|
|||
uiInfo.uiDC.pendingPolys = 0;
|
||||
}
|
||||
|
||||
void UI_ClearScene()
|
||||
void UI_ClearScene( void )
|
||||
{
|
||||
if (uiInfo.uiDC.pendingPolys)
|
||||
{
|
||||
|
|
@ -8198,7 +8196,7 @@ void UI_DrawPolyStretchPic(float x, float y, float w, float h, float s1, float t
|
|||
trap_R_DrawStretchPic(x, y, w, h, s1, t1, s2, t2, hShader);
|
||||
}
|
||||
|
||||
static void UI_MakeExtensionsList()
|
||||
static void UI_MakeExtensionsList( void )
|
||||
{
|
||||
char *eptr;
|
||||
|
||||
|
|
@ -8546,7 +8544,7 @@ void _UI_MouseEvent(int dx, int dy)
|
|||
uiInfo.uiDC.mouseMoveTime = uiInfo.uiDC.realTime;
|
||||
}
|
||||
|
||||
void UI_LoadNonIngame()
|
||||
void UI_LoadNonIngame( void )
|
||||
{
|
||||
const char *menuSet = UI_Cvar_VariableString("ui_menuFiles");
|
||||
|
||||
|
|
|
|||
|
|
@ -531,7 +531,7 @@ typedef struct {
|
|||
void (*drawSides) (float x, float y, float w, float h, float size, qhandle_t shader);
|
||||
void (*drawAngledRect) (float x, float y, float w, float h, const float *u, const float *v, float size, const float *color, unsigned char type, qhandle_t shader);
|
||||
void (*drawTopBottom) (float x, float y, float w, float h, float size, qhandle_t shader);
|
||||
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);
|
||||
|
|
@ -552,7 +552,7 @@ typedef struct {
|
|||
void (*drawAngledTextWithCursor) (float x, float y, const float *u, const float *v, 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);
|
||||
|
|
@ -569,7 +569,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);
|
||||
|
|
@ -624,14 +624,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);
|
||||
|
|
@ -647,24 +647,24 @@ 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 );
|
||||
//Makro - added second parameter
|
||||
menuDef_t *Menus_ActivateByName(const char *p, qboolean special);
|
||||
void Menu_Reset();
|
||||
qboolean Menus_AnyFullScreenVisible();
|
||||
void Menu_Reset( void );
|
||||
qboolean Menus_AnyFullScreenVisible( void );
|
||||
void Menus_Activate(menuDef_t * menu);
|
||||
//Makro - select the right player model icon
|
||||
void UI_RQ3_SelectPlayerIcon(menuDef_t *menu);
|
||||
//Makro - added
|
||||
int Text_maxPaintChars(char *text, float scale, float width);
|
||||
|
||||
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 );
|
||||
//Makro - added second parameter
|
||||
void Menus_OpenByName(const char *p, qboolean special);
|
||||
menuDef_t *Menus_FindByName(const char *p);
|
||||
|
|
@ -672,14 +672,14 @@ 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);
|
||||
|
|
@ -693,7 +693,7 @@ int trap_PC_SourceFileAndLine(int handle, char *filename, int *line);
|
|||
|
||||
//Makro - new rendering stuff
|
||||
void UI_AddQuadToScene(qhandle_t hShader, const polyVert_t *verts);
|
||||
void UI_Render2DScene();
|
||||
void UI_Render2DScene( void );
|
||||
void Rect_ToInnerCoords(rectDef_t *rect, float x, float y, float *resx, float *resy);
|
||||
|
||||
#define UI_POLY_Z_OFFSET -0.00001f
|
||||
|
|
|
|||
Loading…
Reference in a new issue