aboutsummaryrefslogtreecommitdiffstats
path: root/code/cgame
diff options
context:
space:
mode:
authortma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2005-09-23 17:39:14 +0000
committertma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2005-09-23 17:39:14 +0000
commit4bfc084c4974ecff94e273a7608ebc38f1c046ab (patch)
treec22cc0f88365f625da447e3609cc1951fb7590eb /code/cgame
parent4b080c5906fdb1f7ee4e7fe5fdf2375dfcdf5ff4 (diff)
downloadioquake3-aero-4bfc084c4974ecff94e273a7608ebc38f1c046ab.tar.gz
ioquake3-aero-4bfc084c4974ecff94e273a7608ebc38f1c046ab.zip
* Applied ajax's cleanup patch
git-svn-id: svn://svn.icculus.org/quake3/trunk@101 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/cgame')
-rw-r--r--code/cgame/cg_main.c2
-rw-r--r--code/cgame/cg_newdraw.c16
-rw-r--r--code/cgame/cg_players.c2
3 files changed, 10 insertions, 10 deletions
diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c
index 03a4994..105e4cc 100644
--- a/code/cgame/cg_main.c
+++ b/code/cgame/cg_main.c
@@ -1114,7 +1114,7 @@ CG_BuildSpectatorString
=======================
*/
-void CG_BuildSpectatorString() {
+void CG_BuildSpectatorString(void) {
int i;
cg.spectatorList[0] = 0;
for (i = 0; i < MAX_CLIENTS; i++) {
diff --git a/code/cgame/cg_newdraw.c b/code/cgame/cg_newdraw.c
index de82465..f36e547 100644
--- a/code/cgame/cg_newdraw.c
+++ b/code/cgame/cg_newdraw.c
@@ -40,7 +40,7 @@ int drawTeamOverlayModificationCount = -1;
//static char teamChat1[256];
//static char teamChat2[256];
-void CG_InitTeamChat() {
+void CG_InitTeamChat(void) {
memset(teamChat1, 0, sizeof(teamChat1));
memset(teamChat2, 0, sizeof(teamChat2));
memset(systemChat, 0, sizeof(systemChat));
@@ -55,7 +55,7 @@ void CG_SetPrintString(int type, const char *p) {
}
}
-void CG_CheckOrderPending() {
+void CG_CheckOrderPending(void) {
if (cgs.gametype < GT_CTF) {
return;
}
@@ -952,7 +952,7 @@ float CG_GetValue(int ownerDraw) {
return -1;
}
-qboolean CG_OtherTeamHasFlag() {
+qboolean CG_OtherTeamHasFlag(void) {
if (cgs.gametype == GT_CTF || cgs.gametype == GT_1FCTF) {
int team = cg.snap->ps.persistant[PERS_TEAM];
if (cgs.gametype == GT_1FCTF) {
@@ -976,7 +976,7 @@ qboolean CG_OtherTeamHasFlag() {
return qfalse;
}
-qboolean CG_YourTeamHasFlag() {
+qboolean CG_YourTeamHasFlag(void) {
if (cgs.gametype == GT_CTF || cgs.gametype == GT_1FCTF) {
int team = cg.snap->ps.persistant[PERS_TEAM];
if (cgs.gametype == GT_1FCTF) {
@@ -1131,7 +1131,7 @@ static void CG_DrawAreaChat(rectDef_t *rect, float scale, vec4_t color, qhandle_
CG_Text_Paint(rect->x, rect->y + rect->h, scale, color, teamChat2, 0, 0, 0);
}
-const char *CG_GetKillerText() {
+const char *CG_GetKillerText(void) {
const char *s = "";
if ( cg.killerName[0] ) {
s = va("Fragged by %s", cg.killerName );
@@ -1167,7 +1167,7 @@ static void CG_Draw2ndPlace(rectDef_t *rect, float scale, vec4_t color, qhandle_
}
}
-const char *CG_GetGameStatusText() {
+const char *CG_GetGameStatusText(void) {
const char *s = "";
if ( cgs.gametype < GT_TEAM) {
if (cg.snap->ps.persistant[PERS_TEAM] != TEAM_SPECTATOR ) {
@@ -1189,7 +1189,7 @@ static void CG_DrawGameStatus(rectDef_t *rect, float scale, vec4_t color, qhandl
CG_Text_Paint(rect->x, rect->y + rect->h, scale, color, CG_GetGameStatusText(), 0, 0, textStyle);
}
-const char *CG_GameTypeString() {
+const char *CG_GameTypeString(void) {
if ( cgs.gametype == GT_FFA ) {
return "Free For All";
} else if ( cgs.gametype == GT_TEAM ) {
@@ -1824,7 +1824,7 @@ int CG_ClientNumFromName(const char *p) {
return -1;
}
-void CG_ShowResponseHead() {
+void CG_ShowResponseHead(void) {
Menus_OpenByName("voiceMenu");
trap_Cvar_Set("cl_conXOffset", "72");
cg.voiceTime = cg.time;
diff --git a/code/cgame/cg_players.c b/code/cgame/cg_players.c
index a7858fd..dd29fe2 100644
--- a/code/cgame/cg_players.c
+++ b/code/cgame/cg_players.c
@@ -298,7 +298,7 @@ CG_FileExists
static qboolean CG_FileExists(const char *filename) {
int len;
- len = trap_FS_FOpenFile( filename, 0, FS_READ );
+ len = trap_FS_FOpenFile( filename, NULL, FS_READ );
if (len>0) {
return qtrue;
}