summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cl_console.c4
-rw-r--r--src/cl_fx.c2
-rw-r--r--src/cl_input.c4
-rw-r--r--src/cl_local.h1
-rw-r--r--src/cl_main.c4
-rw-r--r--src/cl_newfx.c3
-rw-r--r--src/cmd.c9
-rw-r--r--src/common.c4
-rw-r--r--src/files.c2
-rw-r--r--src/gl_draw.c3
-rw-r--r--src/gl_sky.c2
-rw-r--r--src/in_public.h5
-rw-r--r--src/mdfour.c3
-rw-r--r--src/mvd_game.c2
-rw-r--r--src/snd_dma.c6
-rw-r--r--src/snd_local.h6
-rw-r--r--src/snd_main.c4
-rw-r--r--src/sv_ccmds.c10
-rw-r--r--src/ui_atoms.c2
-rw-r--r--src/ui_local.h1
-rw-r--r--src/ui_menu.c4
-rw-r--r--src/ui_playerconfig.c2
-rw-r--r--src/vid_local.h1
23 files changed, 38 insertions, 46 deletions
diff --git a/src/cl_console.c b/src/cl_console.c
index efd7467..a275889 100644
--- a/src/cl_console.c
+++ b/src/cl_console.c
@@ -624,7 +624,7 @@ Con_DrawNotify
Draws the last few lines of output transparently over the game top
================
*/
-void Con_DrawNotify( void ) {
+static void Con_DrawNotify( void ) {
int v;
char *text;
int i, j;
@@ -694,7 +694,7 @@ Con_DrawSolidConsole
Draws the console with the solid background
================
*/
-void Con_DrawSolidConsole( void ) {
+static void Con_DrawSolidConsole( void ) {
int i, x, y;
int rows;
char *text;
diff --git a/src/cl_fx.c b/src/cl_fx.c
index 2265474..b708e04 100644
--- a/src/cl_fx.c
+++ b/src/cl_fx.c
@@ -1584,7 +1584,7 @@ CL_FlyParticles
*/
#define BEAMLENGTH 16
-void CL_FlyParticles (vec3_t origin, int count)
+static void CL_FlyParticles (vec3_t origin, int count)
{
int i;
cparticle_t *p;
diff --git a/src/cl_input.c b/src/cl_input.c
index 8e65fb8..620f638 100644
--- a/src/cl_input.c
+++ b/src/cl_input.c
@@ -81,10 +81,6 @@ static cvar_t *in_enable;
static cvar_t *in_direct;
#endif
-#if USE_DINPUT
-void DI_FillAPI( inputAPI_t *api );
-#endif
-
/*
============
IN_Activate
diff --git a/src/cl_local.h b/src/cl_local.h
index 37ffd22..442a977 100644
--- a/src/cl_local.h
+++ b/src/cl_local.h
@@ -609,6 +609,7 @@ void CL_SetLightStyle( int index, const char *string, size_t length );
void CL_RunLightStyles (void);
void CL_AddLightStyles (void);
#endif
+void MakeNormalVectors (vec3_t forward, vec3_t right, vec3_t up);
//
// cl_newfx.c
diff --git a/src/cl_main.c b/src/cl_main.c
index 333129d..9d64a73 100644
--- a/src/cl_main.c
+++ b/src/cl_main.c
@@ -804,7 +804,7 @@ static qboolean CL_ServerStatusResponse( const char *status, size_t len, serverS
return qtrue;
}
-void CL_DumpServerInfo( const serverStatus_t *status ) {
+static void CL_DumpServerInfo( const serverStatus_t *status ) {
char key[MAX_STRING_CHARS];
char value[MAX_STRING_CHARS];
const playerStatus_t *player;
@@ -1197,7 +1197,7 @@ static void cl_noskins_changed( cvar_t *self ) {
}
}
-void CL_Name_g( genctx_t *ctx ) {
+static void CL_Name_g( genctx_t *ctx ) {
int i;
clientinfo_t *ci;
diff --git a/src/cl_newfx.c b/src/cl_newfx.c
index eb1eb78..61ecd15 100644
--- a/src/cl_newfx.c
+++ b/src/cl_newfx.c
@@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "cl_local.h"
-extern void MakeNormalVectors (vec3_t forward, vec3_t right, vec3_t up);
/*
@@ -29,7 +28,7 @@ extern void MakeNormalVectors (vec3_t forward, vec3_t right, vec3_t up);
vectoangles2 - this is duplicated in the game DLL, but I need it heref.
======
*/
-void vectoangles2 (vec3_t value1, vec3_t angles)
+static void vectoangles2 (vec3_t value1, vec3_t angles)
{
float forward;
float yaw, pitch;
diff --git a/src/cmd.c b/src/cmd.c
index 44098c5..cf29739 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -219,7 +219,7 @@ static list_t cmd_aliasHash[ALIAS_HASH_SIZE];
Cmd_AliasFind
===============
*/
-cmdalias_t *Cmd_AliasFind( const char *name ) {
+static cmdalias_t *Cmd_AliasFind( const char *name ) {
unsigned hash;
cmdalias_t *alias;
@@ -817,7 +817,7 @@ char *Cmd_ArgsFrom( int from ) {
return cmd_args;
}
-char *Cmd_ArgsRange( int from, int to ) {
+static char *Cmd_ArgsRange( int from, int to ) {
int i;
if( from < 0 || from >= cmd_argc ) {
@@ -1306,7 +1306,7 @@ void Cmd_TokenizeString( const char *text, qboolean macroExpand ) {
Cmd_Find
============
*/
-cmd_function_t *Cmd_Find( const char *name ) {
+static cmd_function_t *Cmd_Find( const char *name ) {
cmd_function_t *cmd;
unsigned hash;
@@ -1758,9 +1758,6 @@ static void Cmd_Complete_f( void ) {
List_Append( &cmd_hash[hash], &cmd->hashEntry );
}
-void Com_Mixed_c( genctx_t *ctx, int argnum ) {
-}
-
static const cmdreg_t c_cmd[] = {
{ "cmdlist", Cmd_List_f },
{ "macrolist", Cmd_MacroList_f },
diff --git a/src/common.c b/src/common.c
index 0bbd30e..41014bf 100644
--- a/src/common.c
+++ b/src/common.c
@@ -731,7 +731,7 @@ void *Z_Realloc( void *ptr, size_t size ) {
Z_Stats_f
========================
*/
-void Z_Stats_f( void ) {
+static void Z_Stats_f( void ) {
size_t bytes = 0, count = 0;
zstats_t *s;
int i;
@@ -1394,7 +1394,7 @@ size_t Com_UptimeLong_m( char *buffer, size_t size ) {
return Com_TimeDiffLong( buffer, size, com_startTime, time( NULL ) );
}
-size_t Com_Random_m( char *buffer, size_t size ) {
+static size_t Com_Random_m( char *buffer, size_t size ) {
return Q_scnprintf( buffer, size, "%d", rand_byte() % 10 );
}
diff --git a/src/files.c b/src/files.c
index 36aeda1..969fd01 100644
--- a/src/files.c
+++ b/src/files.c
@@ -2631,7 +2631,7 @@ fail:
FS_Path_f
============
*/
-void FS_Path_f( void ) {
+static void FS_Path_f( void ) {
searchpath_t *s;
int numFilesInPAK = 0;
#if USE_ZLIB
diff --git a/src/gl_draw.c b/src/gl_draw.c
index d906239..5eb40aa 100644
--- a/src/gl_draw.c
+++ b/src/gl_draw.c
@@ -233,9 +233,6 @@ void R_DrawFillEx( int x, int y, int w, int h, const color_t color ) {
_GL_StretchPic( x, y, w, h, 0, 0, 1, 1, color, TEXNUM_WHITE, 0 );
}
-void R_FadeScreen( void ) {
-}
-
static inline void draw_char( int x, int y, int c, qboolean alt, image_t *image ) {
float s, t;
diff --git a/src/gl_sky.c b/src/gl_sky.c
index 163ae7f..17c492f 100644
--- a/src/gl_sky.c
+++ b/src/gl_sky.c
@@ -369,7 +369,7 @@ void R_DrawSkyBox( void ) {
qglPopMatrix ();
}
-void R_UnsetSky( void ) {
+static void R_UnsetSky( void ) {
int i;
skyrotate = 0;
diff --git a/src/in_public.h b/src/in_public.h
index 9c0eb80..e1b09cb 100644
--- a/src/in_public.h
+++ b/src/in_public.h
@@ -38,3 +38,8 @@ typedef struct inputAPI_s {
qboolean (*GetMotion)( int *dx, int *dy );
} inputAPI_t;
+void VID_FillInputAPI( inputAPI_t *api );
+
+#if USE_DINPUT
+void DI_FillAPI( inputAPI_t *api );
+#endif
diff --git a/src/mdfour.c b/src/mdfour.c
index 2eae170..a4bc2e0 100644
--- a/src/mdfour.c
+++ b/src/mdfour.c
@@ -25,8 +25,7 @@
Boston, MA 02111-1307, USA
*/
-#include <config.h>
-#include "q_shared.h"
+#include "com_local.h"
#include "mdfour.h"
#if SIZEOF_INT > 4
diff --git a/src/mvd_game.c b/src/mvd_game.c
index 1900506..5755bc9 100644
--- a/src/mvd_game.c
+++ b/src/mvd_game.c
@@ -719,7 +719,7 @@ void MVD_SwitchChannel( mvd_client_t *client, mvd_t *mvd ) {
SV_ClientAddMessage( cl, MSG_RELIABLE|MSG_CLEAR );
}
-void MVD_TrySwitchChannel( mvd_client_t *client, mvd_t *mvd ) {
+static void MVD_TrySwitchChannel( mvd_client_t *client, mvd_t *mvd ) {
if( mvd == client->mvd ) {
SV_ClientPrintf( client->cl, PRINT_HIGH,
"[MVD] You are already %s.\n", mvd == &mvd_waitingRoom ?
diff --git a/src/snd_dma.c b/src/snd_dma.c
index 6ef4d00..9dbf8f9 100644
--- a/src/snd_dma.c
+++ b/src/snd_dma.c
@@ -31,12 +31,6 @@ static cvar_t *s_direct;
#endif
static cvar_t *s_mixahead;
-void WAVE_FillAPI( snddmaAPI_t *api );
-
-#if USE_DSOUND
-void DS_FillAPI( snddmaAPI_t *api );
-#endif
-
static snddmaAPI_t snddma;
void DMA_SoundInfo( void ) {
diff --git a/src/snd_local.h b/src/snd_local.h
index 3ff7685..a7e798f 100644
--- a/src/snd_local.h
+++ b/src/snd_local.h
@@ -128,6 +128,12 @@ typedef struct snddmaAPI_s {
void (*Activate)( qboolean active );
} snddmaAPI_t;
+void WAVE_FillAPI( snddmaAPI_t *api );
+
+#if USE_DSOUND
+void DS_FillAPI( snddmaAPI_t *api );
+#endif
+
//extern snddmaAPI_t snddma;
extern dma_t dma;
diff --git a/src/snd_main.c b/src/snd_main.c
index adde37b..1ec689e 100644
--- a/src/snd_main.c
+++ b/src/snd_main.c
@@ -604,7 +604,7 @@ static void S_Spatialize( channel_t *ch ) {
S_AllocPlaysound
=================
*/
-playsound_t *S_AllocPlaysound( void ) {
+static playsound_t *S_AllocPlaysound( void ) {
playsound_t *ps;
ps = s_freeplays.next;
@@ -624,7 +624,7 @@ playsound_t *S_AllocPlaysound( void ) {
S_FreePlaysound
=================
*/
-void S_FreePlaysound( playsound_t *ps ) {
+static void S_FreePlaysound( playsound_t *ps ) {
// unlink from channel
ps->prev->next = ps->next;
ps->next->prev = ps->prev;
diff --git a/src/sv_ccmds.c b/src/sv_ccmds.c
index 30d83d1..a30bdec 100644
--- a/src/sv_ccmds.c
+++ b/src/sv_ccmds.c
@@ -385,7 +385,7 @@ SV_Kick_f
Kick a user off of the server
==================
*/
-void SV_Kick_f( void ) {
+static void SV_Kick_f( void ) {
if( !svs.initialized ) {
Com_Printf( "No server running.\n" );
return;
@@ -610,7 +610,7 @@ static void SV_Status_f( void ) {
SV_ConSay_f
==================
*/
-void SV_ConSay_f( void ) {
+static void SV_ConSay_f( void ) {
client_t *client;
char *s;
@@ -724,7 +724,7 @@ SV_Stuff_f
Stuff raw command string to the client.
==================
*/
-void SV_Stuff_f( void ) {
+static void SV_Stuff_f( void ) {
if( !svs.initialized ) {
Com_Printf( "No server running.\n" );
return;
@@ -753,7 +753,7 @@ SV_Stuff_f
Stuff raw command string to all clients.
==================
*/
-void SV_Stuffall_f( void ) {
+static void SV_Stuffall_f( void ) {
client_t *client;
if( !svs.initialized ) {
@@ -817,7 +817,7 @@ Kick everyone off, possibly in preparation for a new game
===============
*/
-void SV_KillServer_f( void ) {
+static void SV_KillServer_f( void ) {
if( !svs.initialized ) {
Com_Printf( "No server running.\n" );
return;
diff --git a/src/ui_atoms.c b/src/ui_atoms.c
index 2bbfffd..a530156 100644
--- a/src/ui_atoms.c
+++ b/src/ui_atoms.c
@@ -90,7 +90,7 @@ void UI_PushMenu( menuFrameWork_t *menu ) {
}
}
-void UI_Resize( void ) {
+static void UI_Resize( void ) {
int i;
#if USE_REF == REF_SOFT
diff --git a/src/ui_local.h b/src/ui_local.h
index 0160d28..87245c4 100644
--- a/src/ui_local.h
+++ b/src/ui_local.h
@@ -314,6 +314,7 @@ void MenuList_Init( menuList_t *l );
void MenuList_SetValue( menuList_t *l, int value );
void MenuList_Sort( menuList_t *l, int offset,
int (*cmpfunc)( const void *, const void * ) );
+void SpinControl_Init( menuSpinControl_t *s );
qboolean Menu_Push( menuFrameWork_t *menu );
void Menu_Pop( menuFrameWork_t *menu );
void Menu_Free( menuFrameWork_t *menu );
diff --git a/src/ui_menu.c b/src/ui_menu.c
index c99b3a2..d9265e6 100644
--- a/src/ui_menu.c
+++ b/src/ui_menu.c
@@ -1126,7 +1126,7 @@ static void Slider_Push( menuSlider_t *s ) {
cclamp( s->curvalue, s->minvalue, s->maxvalue );
}
-void Slider_Pop( menuSlider_t *s ) {
+static void Slider_Pop( menuSlider_t *s ) {
Cvar_SetValue( s->cvar, s->curvalue, FROM_CONSOLE );
}
@@ -1655,7 +1655,7 @@ menuSound_t Menu_MouseMove( menuCommon_t *item ) {
return QMS_NOTHANDLED;
}
-menuSound_t Menu_DefaultKey( menuFrameWork_t *m, int key ) {
+static menuSound_t Menu_DefaultKey( menuFrameWork_t *m, int key ) {
menuCommon_t *item;
switch( key ) {
diff --git a/src/ui_playerconfig.c b/src/ui_playerconfig.c
index edf1419..8acc44e 100644
--- a/src/ui_playerconfig.c
+++ b/src/ui_playerconfig.c
@@ -144,8 +144,6 @@ static void Size( menuFrameWork_t *self ) {
}
static menuSound_t Change( menuCommon_t *self ) {
- extern void SpinControl_Init( menuSpinControl_t *s );
-
switch( self->id ) {
case ID_MODEL:
m_player.skin.itemnames =
diff --git a/src/vid_local.h b/src/vid_local.h
index 0166514..3666823 100644
--- a/src/vid_local.h
+++ b/src/vid_local.h
@@ -29,7 +29,6 @@ extern cvar_t *_vid_fullscreen;
//
void VID_PumpEvents( void );
void VID_SetMode( void );
-void VID_FillInputAPI( inputAPI_t *api );
//
// cl_ref.c