From e411cc7d14dad08cbbe27f5b3af86700f7eb5184 Mon Sep 17 00:00:00 2001 From: lordhavoc Date: Sun, 27 May 2001 02:50:48 +0000 Subject: [PATCH] cleaned up nearly all of the externs in .c files (moved to appropriate .h files) git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@207 d7cf8633-e32d-0410-b094-e92efae38249 --- cd_win.c | 1 - cl_effects.c | 8 ++--- cl_main.c | 22 ++++++------- cl_parse.c | 32 +++++++------------ client.h | 85 +++++++++++++++++++++++++------------------------ common.c | 2 +- console.c | 10 +++--- gl_draw.c | 18 ++++------- gl_models.c | 18 ++++------- gl_poly.c | 24 +++++++------- gl_poly.h | 20 ++++++------ gl_rmain.c | 56 +++++++++++++++----------------- gl_rmisc.c | 11 +++---- gl_rsurf.c | 27 ++++++---------- gl_screen.c | 16 ++++------ gl_textures.c | 6 ++-- gl_warp.c | 12 ++----- glquake.h | 2 +- host.c | 5 ++- host_cmd.c | 2 -- in_svgalib.c | 8 ++--- keys.c | 2 +- menu.h | 6 +++- model_alias.h | 5 +++ model_brush.c | 16 ++-------- model_brush.h | 4 +++ model_shared.c | 11 ------- model_shared.h | 25 +++++++++++---- model_sprite.h | 3 ++ model_zymotic.h | 3 ++ net.h | 2 ++ net_dgrm.c | 5 --- net_udp.c | 2 -- net_wins.c | 4 +-- net_wipx.c | 2 -- palette.c | 10 +++--- palette.h | 4 +-- pr_edict.c | 2 +- progs.h | 4 +++ quakedef.h | 2 +- r_crosshairs.c | 8 ++--- r_decals.c | 8 ++--- r_decals.h | 4 +-- r_explosion.c | 12 +++---- r_light.c | 16 +++------- r_modules.c | 18 +++++------ r_modules.h | 12 +++---- r_part.c | 8 ++--- render.h | 42 ++++++++++++++++++++++++ server.h | 45 ++++++++++++++++---------- snd_alsa_0_9.c | 2 +- snd_mix.c | 1 - sound.h | 21 ++++++------ sv_main.c | 17 ++-------- sv_phys.c | 1 - sv_user.c | 3 -- transform.c | 4 +-- transform.h | 3 +- vid.h | 8 ++--- vid_3dfxsvga.c | 6 ++-- vid_glx.c | 2 +- vid_shared.c | 2 +- vid_wgl.c | 24 ++++++-------- view.c | 3 -- 64 files changed, 370 insertions(+), 397 deletions(-) diff --git a/cd_win.c b/cd_win.c index 3e249d13..5ef677d0 100644 --- a/cd_win.c +++ b/cd_win.c @@ -24,7 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" extern HWND mainwindow; -extern cvar_t bgmvolume; static qboolean cdValid = false; static qboolean playing = false; diff --git a/cl_effects.c b/cl_effects.c index d1973b8e..5a7cad19 100644 --- a/cl_effects.c +++ b/cl_effects.c @@ -42,21 +42,21 @@ effect_t effect[MAX_EFFECTS]; cvar_t r_draweffects = {"r_draweffects", "1"}; -void r_effects_start() +void r_effects_start(void) { memset(effect, 0, sizeof(effect)); } -void r_effects_shutdown() +void r_effects_shutdown(void) { } -void r_effects_newmap() +void r_effects_newmap(void) { memset(effect, 0, sizeof(effect)); } -void CL_Effects_Init() +void CL_Effects_Init(void) { Cvar_RegisterVariable(&r_draweffects); diff --git a/cl_main.c b/cl_main.c index 89c2f6ca..d8a353e9 100644 --- a/cl_main.c +++ b/cl_main.c @@ -43,8 +43,6 @@ cvar_t m_side = {"m_side","0.8", true}; cvar_t freelook = {"freelook", "1", true}; -cvar_t demo_nehahra = {"demo_nehahra", "0"}; - client_static_t cls; client_state_t cl; // FIXME: put these on hunk? @@ -422,7 +420,7 @@ float CL_EntityLerpPoint (entity_t *ent) return bound(0, f, 1); } -void CL_RelinkStaticEntities() +void CL_RelinkStaticEntities(void) { entity_t *ent, *endent; if (cl.num_statics > MAX_VISEDICTS) @@ -683,9 +681,6 @@ void CL_RelinkEntities (void) } -// used by cl_shownet -int netshown; - /* =============== CL_ReadFromServer @@ -695,7 +690,7 @@ Read all incoming data from the server */ int CL_ReadFromServer (void) { - int ret; + int ret, netshown; cl.oldtime = cl.time; cl.time += cl.frametime; @@ -710,8 +705,13 @@ int CL_ReadFromServer (void) break; cl.last_received_message = realtime; + + if (cl_shownet.value) + netshown = true; + CL_ParseServerMessage (); - } while (ret && cls.state == ca_connected); + } + while (ret && cls.state == ca_connected); if (netshown) Con_Printf ("\n"); @@ -887,9 +887,7 @@ void CL_Init (void) Cmd_AddCommand ("pausedemo", CL_PauseDemo_f); // LordHavoc: added pmodel command (like name, etc, only intended for Nehahra) Cmd_AddCommand ("pmodel", CL_PModel_f); - // LordHavoc: added demo_nehahra cvar - Cvar_RegisterVariable (&demo_nehahra); - if (nehahra) - Cvar_SetValue("demo_nehahra", 1); + + CL_Parse_Init(); } diff --git a/cl_parse.c b/cl_parse.c index c8ac267c..cf626f32 100644 --- a/cl_parse.c +++ b/cl_parse.c @@ -88,6 +88,16 @@ char *svc_strings[128] = //============================================================================= +cvar_t demo_nehahra = {"demo_nehahra", "0"}; + +void CL_Parse_Init(void) +{ + // LordHavoc: added demo_nehahra cvar + Cvar_RegisterVariable (&demo_nehahra); + if (nehahra) + Cvar_SetValue("demo_nehahra", 1); +} + qboolean Nehahrademcompatibility; // LordHavoc: to allow playback of the early Nehahra movie segments qboolean dpprotocol; // LordHavoc: whether or not the current network stream is the enhanced DarkPlaces protocol @@ -229,12 +239,6 @@ void CL_KeepaliveMessage (void) SZ_Clear (&cls.message); } -extern qboolean isworldmodel; -extern char skyname[]; -extern void R_SetSkyBox (char *sky); -extern void FOG_clear(); -extern cvar_t r_farclip; - void CL_ParseEntityLump(char *entdata) { char *data; @@ -329,7 +333,6 @@ void CL_ParseEntityLump(char *entdata) CL_ParseServerInfo ================== */ -extern cvar_t demo_nehahra; void CL_ParseServerInfo (void) { char *str; @@ -669,12 +672,12 @@ void CL_BitProfile_f(void) bitprofilecount = 0; } -void CL_EntityUpdateSetup() +void CL_EntityUpdateSetup(void) { memset(entkill, 1, MAX_EDICTS); } -void CL_EntityUpdateEnd() +void CL_EntityUpdateEnd(void) { int i; for (i = 1;i < MAX_EDICTS;i++) @@ -888,11 +891,6 @@ void CL_ParseEffect2 (void) #define SHOWNET(x) if(cl_shownet.value==2)Con_Printf ("%3i:%s\n", msg_readcount-1, x); -extern void SHOWLMP_decodehide(); -extern void SHOWLMP_decodeshow(); -extern void R_SetSkyBox(char* sky); -extern int netshown; - /* ===================== CL_ParseServerMessage @@ -910,15 +908,9 @@ void CL_ParseServerMessage (void) // if recording demos, copy the message out // if (cl_shownet.value == 1) - { Con_Printf ("%i ",net_message.cursize); - netshown = true; - } else if (cl_shownet.value == 2) - { Con_Printf ("------------------\n"); - netshown = true; - } cl.onground = false; // unless the server says otherwise // diff --git a/client.h b/client.h index 130f26f0..0ff6de07 100644 --- a/client.h +++ b/client.h @@ -272,20 +272,20 @@ extern beam_t cl_beams[MAX_BEAMS]; // // cl_main // -void CL_AllocDlight (entity_t *ent, vec3_t org, float radius, float red, float green, float blue, float decay, float lifetime); -void CL_DecayLights (void); +extern void CL_AllocDlight (entity_t *ent, vec3_t org, float radius, float red, float green, float blue, float decay, float lifetime); +extern void CL_DecayLights (void); -void CL_Init (void); +extern void CL_Init (void); -void CL_EstablishConnection (char *host); -void CL_Signon1 (void); -void CL_Signon2 (void); -void CL_Signon3 (void); -void CL_Signon4 (void); +extern void CL_EstablishConnection (char *host); +extern void CL_Signon1 (void); +extern void CL_Signon2 (void); +extern void CL_Signon3 (void); +extern void CL_Signon4 (void); -void CL_Disconnect (void); -void CL_Disconnect_f (void); -void CL_NextDemo (void); +extern void CL_Disconnect (void); +extern void CL_Disconnect_f (void); +extern void CL_NextDemo (void); // LordHavoc: raised this from 256 to the maximum possible number of entities visible #define MAX_VISEDICTS (MAX_EDICTS + MAX_STATIC_ENTITIES + MAX_TEMP_ENTITIES) @@ -306,61 +306,62 @@ extern kbutton_t in_mlook, in_klook; extern kbutton_t in_strafe; extern kbutton_t in_speed; -void CL_InitInput (void); -void CL_SendCmd (void); -void CL_SendMove (usercmd_t *cmd); +extern void CL_InitInput (void); +extern void CL_SendCmd (void); +extern void CL_SendMove (usercmd_t *cmd); -void CL_ParseTEnt (void); -void CL_UpdateTEnts (void); -void CL_DoEffects (void); +extern void CL_ParseTEnt (void); +extern void CL_UpdateTEnts (void); +extern void CL_DoEffects (void); -entity_t *CL_NewTempEntity (void); +extern entity_t *CL_NewTempEntity (void); -void CL_Effect(vec3_t org, int modelindex, int startframe, int framecount, float framerate); +extern void CL_Effect(vec3_t org, int modelindex, int startframe, int framecount, float framerate); -void CL_ClearState (void); +extern void CL_ClearState (void); -int CL_ReadFromServer (void); -void CL_WriteToServer (usercmd_t *cmd); -void CL_BaseMove (usercmd_t *cmd); +extern int CL_ReadFromServer (void); +extern void CL_WriteToServer (usercmd_t *cmd); +extern void CL_BaseMove (usercmd_t *cmd); -float CL_KeyState (kbutton_t *key); -char *Key_KeynumToString (int keynum); +extern float CL_KeyState (kbutton_t *key); +extern char *Key_KeynumToString (int keynum); // // cl_demo.c // -void CL_StopPlayback (void); -int CL_GetMessage (void); +extern void CL_StopPlayback (void); +extern int CL_GetMessage (void); -void CL_Stop_f (void); -void CL_Record_f (void); -void CL_PlayDemo_f (void); -void CL_TimeDemo_f (void); +extern void CL_Stop_f (void); +extern void CL_Record_f (void); +extern void CL_PlayDemo_f (void); +extern void CL_TimeDemo_f (void); // // cl_parse.c // -void CL_ParseServerMessage (void); -void CL_BitProfile_f(void); +extern void CL_Parse_Init(void); +extern void CL_ParseServerMessage(void); +extern void CL_BitProfile_f(void); // // view // -void V_StartPitchDrift (void); -void V_StopPitchDrift (void); +extern void V_StartPitchDrift (void); +extern void V_StopPitchDrift (void); -void V_RenderView (void); -void V_UpdateBlends (void); -void V_Register (void); -void V_ParseDamage (void); -void V_SetContentsColor (int contents); +extern void V_RenderView (void); +extern void V_UpdateBlends (void); +extern void V_Register (void); +extern void V_ParseDamage (void); +extern void V_SetContentsColor (int contents); // // cl_tent // -void CL_InitTEnts (void); -void CL_SignonReply (void); +extern void CL_InitTEnts (void); +extern void CL_SignonReply (void); diff --git a/common.c b/common.c index 71731726..d5eed882 100644 --- a/common.c +++ b/common.c @@ -1217,7 +1217,7 @@ void qfree(void *mem) free(m); } -void GL_TextureStats_PrintTotal(void); +extern void GL_TextureStats_PrintTotal(void); extern int hunk_low_used, hunk_high_used, hunk_size; void COM_Memstats_f(void) { diff --git a/console.c b/console.c index fe491066..2c8939b1 100644 --- a/console.c +++ b/console.c @@ -80,15 +80,13 @@ void Con_ToggleConsole_f (void) if (key_dest == key_console) { if (cls.state == ca_connected) - { +// { key_dest = key_game; - key_lines[edit_line][1] = 0; // clear any typing - key_linepos = 1; - } +// key_lines[edit_line][1] = 0; // clear any typing +// key_linepos = 1; +// } else - { M_Menu_Main_f (); - } } else key_dest = key_console; diff --git a/gl_draw.c b/gl_draw.c index 5840b946..59ed467e 100644 --- a/gl_draw.c +++ b/gl_draw.c @@ -119,16 +119,12 @@ qpic_t *Draw_CachePic (char *path) return &pic->pic; } -extern void LoadSky_f(void); - /* =============== Draw_Init =============== */ -void rmain_registercvars(); - -void gl_draw_start() +void gl_draw_start(void) { int i; @@ -150,11 +146,11 @@ void gl_draw_start() draw_disc = Draw_PicFromWad ("disc"); } -void gl_draw_shutdown() +void gl_draw_shutdown(void) { } -void gl_draw_newmap() +void gl_draw_newmap(void) { } @@ -473,7 +469,7 @@ typedef struct showlmp_s showlmp_t showlmp[SHOWLMP_MAXLABELS]; -void SHOWLMP_decodehide() +void SHOWLMP_decodehide(void) { int i; byte *lmplabel; @@ -486,7 +482,7 @@ void SHOWLMP_decodehide() } } -void SHOWLMP_decodeshow() +void SHOWLMP_decodeshow(void) { int i, k; byte lmplabel[256], picname[256]; @@ -525,7 +521,7 @@ void SHOWLMP_decodeshow() showlmp[k].y = y; } -void SHOWLMP_drawall() +void SHOWLMP_drawall(void) { int i; for (i = 0;i < SHOWLMP_MAXLABELS;i++) @@ -533,7 +529,7 @@ void SHOWLMP_drawall() Draw_Pic(showlmp[i].x, showlmp[i].y, Draw_CachePic(showlmp[i].pic)); } -void SHOWLMP_clear() +void SHOWLMP_clear(void) { int i; for (i = 0;i < SHOWLMP_MAXLABELS;i++) diff --git a/gl_models.c b/gl_models.c index ebc22794..2829b944 100644 --- a/gl_models.c +++ b/gl_models.c @@ -29,7 +29,7 @@ void GL_LockArray(int first, int count) } } -void GL_UnlockArray() +void GL_UnlockArray(void) { if (arraylocked) { @@ -52,7 +52,7 @@ void GL_SetupModelTransform (vec3_t origin, vec3_t angles, vec_t scale) glRotatef (angles[2], 1, 0, 0); } -void makechrometexture() +void makechrometexture(void) { int i; byte noise[64*64]; @@ -70,7 +70,7 @@ void makechrometexture() chrometexture = R_LoadTexture ("chrometexture", 64, 64, &data[0][0], TEXF_MIPMAP | TEXF_RGBA | TEXF_PRECACHE); } -void gl_models_start() +void gl_models_start(void) { // allocate vertex processing arrays aliasvert = qmalloc(sizeof(float[MD2MAX_VERTS][3])); @@ -82,7 +82,7 @@ void gl_models_start() makechrometexture(); } -void gl_models_shutdown() +void gl_models_shutdown(void) { qfree(aliasvert); qfree(aliasvertnorm); @@ -92,11 +92,11 @@ void gl_models_shutdown() qfree(aliasvertusage); } -void gl_models_newmap() +void gl_models_newmap(void) { } -void GL_Models_Init() +void GL_Models_Init(void) { Cvar_RegisterVariable(&gl_transform); Cvar_RegisterVariable(&gl_lockarrays); @@ -104,11 +104,6 @@ void GL_Models_Init() R_RegisterModule("GL_Models", gl_models_start, gl_models_shutdown, gl_models_newmap); } -extern vec3_t softwaretransform_x; -extern vec3_t softwaretransform_y; -extern vec3_t softwaretransform_z; -extern vec_t softwaretransform_scale; -extern vec3_t softwaretransform_offset; void R_AliasTransformVerts(int vertcount) { int i; @@ -321,7 +316,6 @@ R_DrawAliasFrame ================= */ -extern vec3_t lightspot; void R_LightModel(entity_t *ent, int numverts, vec3_t center, vec3_t basecolor); void R_DrawAliasFrame (maliashdr_t *maliashdr, float alpha, vec3_t color, entity_t *ent, int shadow, vec3_t org, vec3_t angles, vec_t scale, frameblend_t *blend, rtexture_t **skin, int colormap, int effects, int flags) { diff --git a/gl_poly.c b/gl_poly.c index 4a2e7a12..37c8c722 100644 --- a/gl_poly.c +++ b/gl_poly.c @@ -34,7 +34,7 @@ float transviewdist; // distance of view origin along the view normal float transreciptable[256]; -void gl_poly_start() +void gl_poly_start(void) { int i; transvert = qmalloc(MAX_TRANSVERTS * sizeof(transvert_t)); @@ -50,7 +50,7 @@ void gl_poly_start() transreciptable[i] = 1.0f / i; } -void gl_poly_shutdown() +void gl_poly_shutdown(void) { qfree(transvert); qfree(transpoly); @@ -62,17 +62,17 @@ void gl_poly_shutdown() qfree(skypoly); } -void gl_poly_newmap() +void gl_poly_newmap(void) { } -void GL_Poly_Init() +void GL_Poly_Init(void) { Cvar_RegisterVariable (&gl_multitexture); R_RegisterModule("GL_Poly", gl_poly_start, gl_poly_shutdown, gl_poly_newmap); } -void transpolyclear() +void transpolyclear(void) { currenttranspoly = currenttransvert = 0; currenttranslist = translist; @@ -117,7 +117,7 @@ void transpolyvert(float x, float y, float z, float s, float t, int r, int g, in } */ -void transpolyend() +void transpolyend(void) { float center, d, maxdist; int i; @@ -156,7 +156,7 @@ void transpolyend() int transpolyindices; -void transpolyrender() +void transpolyrender(void) { int i, j, tpolytype, texnum; transpoly_t *p; @@ -349,12 +349,12 @@ void transpolyrender() glDisable(GL_ALPHA_TEST); } -void wallpolyclear() +void wallpolyclear(void) { currentwallpoly = currentwallvert = 0; } -void wallpolyrender() +void wallpolyrender(void) { int i, j, texnum, lighttexnum; wallpoly_t *p; @@ -569,14 +569,12 @@ lit: glDepthMask(1); } -void skypolyclear() +void skypolyclear(void) { currentskypoly = currentskyvert = 0; } -extern char skyname[]; -extern rtexture_t *solidskytexture, *alphaskytexture; -void skypolyrender() +void skypolyrender(void) { int i, j; skypoly_t *p; diff --git a/gl_poly.h b/gl_poly.h index 25747e9a..3ecc1412 100644 --- a/gl_poly.h +++ b/gl_poly.h @@ -1,22 +1,20 @@ -extern float fog_density, fog_red, fog_green, fog_blue; - #define TPOLYTYPE_ALPHA 0 #define TPOLYTYPE_ADD 1 -extern void transpolyclear(); -extern void transpolyrender(); +extern void transpolyclear(void); +extern void transpolyrender(void); extern void transpolybegin(int texnum, int glowtexnum, int fogtexnum, int transpolytype); -extern void transpolyend(); +extern void transpolyend(void); -extern void wallpolyclear(); -extern void wallpolyrender(); +extern void wallpolyclear(void); +extern void wallpolyrender(void); -extern void skypolyclear(); -extern void skypolyrender(); -extern void skypolybegin(); +extern void skypolyclear(void); +extern void skypolyrender(void); +extern void skypolybegin(void); extern void skypolyvert(float x, float y, float z); -extern void skypolyend(); +extern void skypolyend(void); #define MAX_TRANSPOLYS 65536 #define MAX_TRANSVERTS (MAX_TRANSPOLYS*4) diff --git a/gl_rmain.c b/gl_rmain.c index d1acf332..2303c554 100644 --- a/gl_rmain.c +++ b/gl_rmain.c @@ -139,7 +139,7 @@ vec_t fogdensity; float fog_density, fog_red, fog_green, fog_blue; qboolean fogenabled; qboolean oldgl_fogenable; -void FOG_framebegin() +void FOG_framebegin(void) { if (nehahra) { @@ -215,13 +215,13 @@ void FOG_framebegin() } } -void FOG_frameend() +void FOG_frameend(void) { if (glfog.value) glDisable(GL_FOG); } -void FOG_clear() +void FOG_clear(void) { if (nehahra) { @@ -234,7 +234,7 @@ void FOG_clear() fog_density = fog_red = fog_green = fog_blue = 0.0f; } -void FOG_registercvars() +void FOG_registercvars(void) { Cvar_RegisterVariable (&glfog); if (nehahra) @@ -249,19 +249,19 @@ void FOG_registercvars() } } -void gl_main_start() +void gl_main_start(void) { } -void gl_main_shutdown() +void gl_main_shutdown(void) { } -void gl_main_newmap() +void gl_main_newmap(void) { } -void GL_Main_Init() +void GL_Main_Init(void) { FOG_registercvars(); Cvar_RegisterVariable (&r_drawentities); @@ -283,20 +283,20 @@ void GL_Main_Init() R_RegisterModule("GL_Main", gl_main_start, gl_main_shutdown, gl_main_newmap); } -extern void GL_Draw_Init(); -extern void GL_Main_Init(); -extern void GL_Models_Init(); -extern void GL_Poly_Init(); -extern void GL_Surf_Init(); -extern void GL_Screen_Init(); -extern void GL_Misc_Init(); -extern void R_Crosshairs_Init(); -extern void R_Light_Init(); -extern void R_Particles_Init(); -extern void R_Explosion_Init(); -extern void CL_Effects_Init(); - -void Render_Init() +extern void GL_Draw_Init(void); +extern void GL_Main_Init(void); +extern void GL_Models_Init(void); +extern void GL_Poly_Init(void); +extern void GL_Surf_Init(void); +extern void GL_Screen_Init(void); +extern void GL_Misc_Init(void); +extern void R_Crosshairs_Init(void); +extern void R_Light_Init(void); +extern void R_Particles_Init(void); +extern void R_Explosion_Init(void); +extern void CL_Effects_Init(void); + +void Render_Init(void) { R_Modules_Shutdown(); GL_Draw_Init(); @@ -627,8 +627,6 @@ void MYgluPerspective( GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdouble } -extern char skyname[]; - /* ============= R_SetupGL @@ -637,7 +635,6 @@ R_SetupGL void R_SetupGL (void) { float screenaspect; - extern int glwidth, glheight; int x, x2, y2, y, w, h; if (!r_render.value) @@ -724,7 +721,7 @@ void R_Clear (void) } // LordHavoc: my trick to *FIX* GLQuake lighting once and for all :) -void GL_Brighten() +void GL_Brighten(void) { if (!r_render.value) return; @@ -751,7 +748,7 @@ void GL_Brighten() glEnable (GL_CULL_FACE); } -void GL_BlendView() +void GL_BlendView(void) { if (!r_render.value) return; @@ -802,9 +799,8 @@ R_RenderView r_refdef must be set before the first call ================ */ -extern qboolean intimerefresh; -extern void R_Sky(); -extern void UploadLightmaps(); +extern void R_Sky(void); +extern void UploadLightmaps(void); char r_speeds2_string1[81], r_speeds2_string2[81], r_speeds2_string3[81], r_speeds2_string4[81], r_speeds2_string5[81], r_speeds2_string6[81], r_speeds2_string7[81]; void R_RenderView (void) { diff --git a/gl_rmisc.c b/gl_rmisc.c index 19817533..a4b675d1 100644 --- a/gl_rmisc.c +++ b/gl_rmisc.c @@ -93,15 +93,15 @@ void R_Envmap_f (void) void R_InitParticles (void); -void gl_misc_start() +void gl_misc_start(void) { } -void gl_misc_shutdown() +void gl_misc_shutdown(void) { } -void gl_misc_newmap() +void gl_misc_newmap(void) { } @@ -118,15 +118,14 @@ void GL_Misc_Init (void) R_RegisterModule("GL_Misc", gl_misc_start, gl_misc_shutdown, gl_misc_newmap); } -void R_ClearParticles (void); -void GL_BuildLightmaps (void); +extern void R_ClearParticles (void); +extern void GL_BuildLightmaps (void); /* =============== R_NewMap =============== */ -void SHOWLMP_clear(); void R_NewMap (void) { int i; diff --git a/gl_rsurf.c b/gl_rsurf.c index 2b0f1c17..8029f021 100644 --- a/gl_rsurf.c +++ b/gl_rsurf.c @@ -54,19 +54,19 @@ int lightmapbytes; int wateralpha; -void gl_surf_start() +void gl_surf_start(void) { } -void gl_surf_shutdown() +void gl_surf_shutdown(void) { } -void gl_surf_newmap() +void gl_surf_newmap(void) { } -void GL_Surf_Init() +void GL_Surf_Init(void) { int i; for (i = 0;i < MAX_LIGHTMAPS;i++) @@ -418,12 +418,6 @@ texture_t *R_TextureAnimation (texture_t *base) */ -extern int solidskytexture; -extern int alphaskytexture; -extern float speedscale; // for top sky and bottom sky - -extern char skyname[]; - float turbsin[256] = { #include "gl_warp_sin.h" @@ -431,7 +425,7 @@ float turbsin[256] = #define TURBSCALE (256.0 / (2 * M_PI)) -void UploadLightmaps() +void UploadLightmaps(void) { int i; if (nosubimage || nosubimagefragments) @@ -783,8 +777,6 @@ void RSurf_DrawWall(msurface_t *s, texture_t *t, int transform) } // LordHavoc: transparent brush models -extern float modelalpha; - void RSurf_DrawWallVertex(msurface_t *s, texture_t *t, int transform, int isbmodel) { int i, alpha, size3; @@ -964,7 +956,6 @@ void R_DrawBrushModel (entity_t *e) */ static byte *worldvis; -extern cvar_t r_novis; void R_MarkLeaves (void) { @@ -978,7 +969,7 @@ void R_MarkLeaves (void) worldvis = Mod_LeafPVS (r_viewleaf, cl.worldmodel); } -void R_SolidWorldNode () +void R_SolidWorldNode (void) { int l; mleaf_t *leaf; @@ -1025,7 +1016,7 @@ void R_SolidWorldNode () /* // experimental and inferior to the other in recursion depth allowances -void R_PortalWorldNode () +void R_PortalWorldNode (void) { int i, j; mportal_t *p; @@ -1098,7 +1089,7 @@ void R_PortalWorldNode () } */ -void R_PortalWorldNode () +void R_PortalWorldNode (void) { int portalstack, i; mportal_t *p, *pstack[8192]; @@ -1213,7 +1204,7 @@ void R_DrawSurfaces (void) } } -void R_DrawPortals() +void R_DrawPortals(void) { int drawportals, i, r, g, b; mleaf_t *leaf, *endleaf; diff --git a/gl_screen.c b/gl_screen.c index 9b2a7b22..07238d49 100644 --- a/gl_screen.c +++ b/gl_screen.c @@ -355,18 +355,18 @@ void SCR_SizeDown_f (void) //============================================================================ -void gl_screen_start() +void gl_screen_start(void) { scr_ram = Draw_PicFromWad ("ram"); scr_net = Draw_PicFromWad ("net"); scr_turtle = Draw_PicFromWad ("turtle"); } -void gl_screen_shutdown() +void gl_screen_shutdown(void) { } -void gl_screen_newmap() +void gl_screen_newmap(void) { } @@ -708,10 +708,7 @@ void SCR_DrawNotifyString (void) void DrawCrosshair(int num); void GL_Set2D (void); -extern void SHOWLMP_drawall(); -extern cvar_t r_speeds2; - -void GL_BrightenScreen() +void GL_BrightenScreen(void) { float f; @@ -785,7 +782,7 @@ text to the screen. LordHavoc: due to my rewrite of R_WorldNode, it no longer takes 256k of stack space :) ================== */ -void GL_Finish(); +void GL_Finish(void); void SCR_UpdateScreen (void) { double time1 = 0, time2; @@ -884,7 +881,6 @@ void SCR_UpdateScreen (void) if (r_speeds2.value) { - extern char r_speeds2_string1[81], r_speeds2_string2[81], r_speeds2_string3[81], r_speeds2_string4[81], r_speeds2_string5[81], r_speeds2_string6[81], r_speeds2_string7[81]; Draw_String(0, vid.height - sb_lines - 56, r_speeds2_string1, 80); Draw_String(0, vid.height - sb_lines - 48, r_speeds2_string2, 80); Draw_String(0, vid.height - sb_lines - 40, r_speeds2_string3, 80); @@ -909,7 +905,7 @@ void SCR_UpdateScreen (void) } // for profiling, this is separated -void GL_Finish() +void GL_Finish(void) { if (!r_render.value) return; diff --git a/gl_textures.c b/gl_textures.c index 8236e626..4cc437b6 100644 --- a/gl_textures.c +++ b/gl_textures.c @@ -157,7 +157,7 @@ void GL_TextureStats_f(void) char engineversion[40]; //void GL_UploadTexture (gltexture_t *glt); -void r_textures_start() +void r_textures_start(void) { // int i; // gltexture_t *glt; @@ -165,11 +165,11 @@ void r_textures_start() // GL_UploadTexture(glt); } -void r_textures_shutdown() +void r_textures_shutdown(void) { } -void r_textures_newmap() +void r_textures_newmap(void) { } diff --git a/gl_warp.c b/gl_warp.c index 6c9b795c..feaeeb40 100644 --- a/gl_warp.c +++ b/gl_warp.c @@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" -extern model_t *loadmodel; - int skytexturenum; rtexture_t *solidskytexture; @@ -31,8 +29,6 @@ float speedscale; // for top sky and bottom sky msurface_t *warpface; -extern cvar_t gl_subdivide_size; - void BoundPoly (int numverts, float *verts, vec3_t mins, vec3_t maxs) { int i, j; @@ -243,13 +239,11 @@ void LoadSky_f (void) } } -extern cvar_t r_farclip; - #define R_SkyBoxPolyVec(s,t,x,y,z) \ glTexCoord2f((s) * (254.0f/256.0f) + (1.0f/256.0f), (t) * (254.0f/256.0f) + (1.0f/256.0f));\ glVertex3f((x) * 1024.0 + r_origin[0], (y) * 1024.0 + r_origin[1], (z) * 1024.0 + r_origin[2]); -void R_SkyBox() +void R_SkyBox(void) { glDisable (GL_BLEND); glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); @@ -356,7 +350,7 @@ void skydome(float *source, float s, float texscale) glDisableClientState(GL_TEXTURE_COORD_ARRAY); } -void R_SkyDome() +void R_SkyDome(void) { glDisable (GL_BLEND); glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); @@ -384,7 +378,7 @@ void R_SkyDome() } */ -void R_Sky() +void R_Sky(void) { if (!r_render.value) return; diff --git a/glquake.h b/glquake.h index eea60c1a..d85f6d21 100644 --- a/glquake.h +++ b/glquake.h @@ -188,7 +188,7 @@ extern qboolean lighthalf; #include "r_lerpanim.h" void GL_LockArray(int first, int count); -void GL_UnlockArray(); +void GL_UnlockArray(void); void R_DrawAliasModel (entity_t *ent, int cull, float alpha, model_t *clmodel, frameblend_t *blend, int skin, vec3_t org, vec3_t angles, vec_t scale, int effects, int flags, int colormap); diff --git a/host.c b/host.c index d169181f..675e30ea 100644 --- a/host.c +++ b/host.c @@ -119,7 +119,6 @@ This shuts down both the client and server ================ */ char hosterrorstring[4096]; -extern qboolean hostloopactive; void Host_Error (char *error, ...) { va_list argptr; @@ -762,14 +761,14 @@ void Host_Frame (float time) //============================================================================ -void Render_Init(); +void Render_Init(void); /* ==================== Host_Init ==================== */ -void Host_Init () +void Host_Init (void) { int i; /* diff --git a/host_cmd.c b/host_cmd.c index 5a23bfca..5e0a66f6 100644 --- a/host_cmd.c +++ b/host_cmd.c @@ -20,8 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" -extern cvar_t pausable; - int current_skill; void Mod_Print (void); diff --git a/in_svgalib.c b/in_svgalib.c index 7c258a0c..d1854309 100644 --- a/in_svgalib.c +++ b/in_svgalib.c @@ -60,8 +60,8 @@ static float mouse_x, mouse_y; static float old_mouse_x, old_mouse_y; static int mx, my; -static void IN_init_kb(); -static void IN_init_mouse(); +static void IN_init_kb(void); +static void IN_init_mouse(void); cvar_t m_filter = {"m_filter","0"}; @@ -111,7 +111,7 @@ void IN_Init(void) in_svgalib_inited = 1; } -static void IN_init_kb() +static void IN_init_kb(void) { int i; @@ -231,7 +231,7 @@ static void IN_init_kb() keyboard_seteventhandler(keyhandler); } -static void IN_init_mouse() +static void IN_init_mouse(void) { int mtype; char *mousedev; diff --git a/keys.c b/keys.c index 8d4de8b9..c3a8a754 100644 --- a/keys.c +++ b/keys.c @@ -321,7 +321,7 @@ void Key_Message (int key) } // LordHavoc: increased messagemode length (was 31) - if (chat_bufferlen == 255) + if (chat_bufferlen == 240) return; // all full chat_buffer[chat_bufferlen++] = key; diff --git a/menu.h b/menu.h index 616de3f8..8b5a34e1 100644 --- a/menu.h +++ b/menu.h @@ -25,7 +25,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MNET_IPX 1 #define MNET_TCP 2 -extern int m_activenet; +extern int m_activenet; +extern int m_return_state; +extern int m_state; +extern qboolean m_return_onerror; +extern char m_return_reason[32]; // // menus diff --git a/model_alias.h b/model_alias.h index 4d30cdae..3bac356c 100644 --- a/model_alias.h +++ b/model_alias.h @@ -198,4 +198,9 @@ typedef struct #define ALIASTYPE_MD2 2 #define ALIASTYPE_ZYM 3 +extern void Mod_LoadAliasModel (struct model_s *mod, void *buffer); +extern void Mod_LoadQ2AliasModel (struct model_s *mod, void *buffer); + +extern void Mod_AliasInit(void); + #include "model_zymotic.h" \ No newline at end of file diff --git a/model_brush.c b/model_brush.c index 803fa925..b01c1c37 100644 --- a/model_brush.c +++ b/model_brush.c @@ -141,14 +141,10 @@ byte *Mod_LeafPVS (mleaf_t *leaf, model_t *model) return Mod_DecompressVis (leaf->compressed_vis, model); } -extern byte *mod_base; - -extern cvar_t r_fullbrights; - rtexture_t *r_notexture; texture_t r_notexture_mip; -void Mod_SetupNoTexture() +void Mod_SetupNoTexture(void) { int x, y; byte pix[16][16][4]; @@ -546,10 +542,6 @@ void Mod_LoadVisibility (lump_t *l) memcpy (loadmodel->visdata, mod_base + l->fileofs, l->filelen); } -void CL_ParseEntityLump(char *entdata); - -extern qboolean isworldmodel; - /* ================= Mod_LoadEntities @@ -766,8 +758,6 @@ void CalcSurfaceExtents (msurface_t *s) void GL_SubdivideSurface (msurface_t *fa); -extern char skyname[]; - /* ================= Mod_LoadFaces @@ -1497,7 +1487,7 @@ portal_t *AllocPortal (void) return p; } -void Mod_FinalizePortals() +void Mod_FinalizePortals(void) { int i, j, numportals, numpoints; portal_t *p, *pnext; @@ -1854,7 +1844,7 @@ void Mod_MakeOutsidePortals(mnode_t *node) } */ -void Mod_MakePortals() +void Mod_MakePortals(void) { // Con_Printf("building portals for %s\n", loadmodel->name); diff --git a/model_brush.h b/model_brush.h index 6470e1a9..61dbc1ec 100644 --- a/model_brush.h +++ b/model_brush.h @@ -202,5 +202,9 @@ typedef struct mportal_s } mportal_t; +extern void CL_ParseEntityLump(char *entdata); extern rtexture_t *r_notexture; extern texture_t r_notexture_mip; + +extern void Mod_LoadBrushModel (struct model_s *mod, void *buffer); +extern void Mod_BrushInit(void); diff --git a/model_shared.c b/model_shared.c index 1aaac8e4..9b5fc1d1 100644 --- a/model_shared.c +++ b/model_shared.c @@ -27,22 +27,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. model_t *loadmodel; char loadname[32]; // for hunk tags -extern void Mod_LoadSpriteModel (model_t *mod, void *buffer); -extern void Mod_LoadBrushModel (model_t *mod, void *buffer); -extern void Mod_LoadAliasModel (model_t *mod, void *buffer); -extern void Mod_LoadQ2AliasModel (model_t *mod, void *buffer); -extern void Mod_LoadZymoticModel (model_t *mod, void *buffer); -model_t *Mod_LoadModel (model_t *mod, qboolean crash); - // LordHavoc: increased from 512 to 2048 #define MAX_MOD_KNOWN 2048 model_t mod_known[MAX_MOD_KNOWN]; int mod_numknown; -extern void Mod_BrushInit(); -extern void Mod_AliasInit(); -extern void Mod_SpriteInit(); - /* =============== Mod_Init diff --git a/model_shared.h b/model_shared.h index d5af37ad..0955d56f 100644 --- a/model_shared.h +++ b/model_shared.h @@ -142,20 +142,31 @@ typedef struct model_s //============================================================================ -void Mod_Init (void); -void Mod_ClearAll (void); +// used to avoid setting up submodels in non-world bmodels +extern qboolean isworldmodel; +// model loading +extern model_t *loadmodel; +extern byte *mod_base; +// sky/water subdivision +extern cvar_t gl_subdivide_size; +// texture fullbrights +extern cvar_t r_fullbrights; + +void Mod_Init (void); +void Mod_ClearAll (void); model_t *Mod_ForName (char *name, qboolean crash); -void *Mod_Extradata (model_t *mod); // handles caching -void Mod_TouchModel (char *name); +void *Mod_Extradata (model_t *mod); // handles caching +void Mod_TouchModel (char *name); mleaf_t *Mod_PointInLeaf (float *p, model_t *model); -byte *Mod_LeafPVS (mleaf_t *leaf, model_t *model); +byte *Mod_LeafPVS (mleaf_t *leaf, model_t *model); -extern model_t *loadmodel; -extern char loadname[32]; // for hunk tags +extern model_t *loadmodel; +extern char loadname[32]; // for hunk tags extern model_t *Mod_LoadModel (model_t *mod, qboolean crash); extern float RadiusFromBounds (vec3_t mins, vec3_t maxs); extern model_t *Mod_FindName (char *name); + #endif // __MODEL__ diff --git a/model_sprite.h b/model_sprite.h index 595f2266..05b0dce3 100644 --- a/model_sprite.h +++ b/model_sprite.h @@ -47,3 +47,6 @@ typedef struct // void *cachespot; // remove? int ofs_frames; } msprite_t; + +extern void Mod_LoadSpriteModel (struct model_s *mod, void *buffer); +extern void Mod_SpriteInit(void); diff --git a/model_zymotic.h b/model_zymotic.h index d5d96e87..ff3f4b3d 100644 --- a/model_zymotic.h +++ b/model_zymotic.h @@ -1,3 +1,4 @@ + typedef struct zymlump_s { int start; @@ -59,3 +60,5 @@ typedef struct zymvertex_s float origin[3]; } zymvertex_t; + +extern void Mod_LoadZymoticModel (struct model_s *mod, void *buffer); diff --git a/net.h b/net.h index 19362ce4..105df0f5 100644 --- a/net.h +++ b/net.h @@ -325,4 +325,6 @@ extern qboolean slistInProgress; extern qboolean slistSilent; extern qboolean slistLocal; +extern cvar_t hostname; + void NET_Slist_f (void); diff --git a/net_dgrm.c b/net_dgrm.c index b9ef1c19..fb7c7e7c 100644 --- a/net_dgrm.c +++ b/net_dgrm.c @@ -78,11 +78,6 @@ struct byte data[MAX_DATAGRAM]; } packetBuffer; -extern int m_return_state; -extern int m_state; -extern qboolean m_return_onerror; -extern char m_return_reason[32]; - //#ifdef DEBUG char *StrAddr (struct qsockaddr *addr) diff --git a/net_udp.c b/net_udp.c index f21c3ebd..ed5d066e 100644 --- a/net_udp.c +++ b/net_udp.c @@ -40,8 +40,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern int gethostname (char *, int); extern int close (int); -extern cvar_t hostname; - static int net_acceptsocket = -1; // socket for fielding new connections static int net_controlsocket; static int net_broadcastsocket = 0; diff --git a/net_wins.c b/net_wins.c index f16c5152..21eedf8c 100644 --- a/net_wins.c +++ b/net_wins.c @@ -22,8 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" #include "winquake.h" -extern cvar_t hostname; - #define MAXHOSTNAMELEN 256 static int net_acceptsocket = -1; // socket for fielding new connections @@ -88,7 +86,7 @@ BOOL PASCAL FAR BlockingHook(void) } -void WINS_GetLocalAddress() +void WINS_GetLocalAddress(void) { struct hostent *local = NULL; char buff[MAXHOSTNAMELEN]; diff --git a/net_wipx.c b/net_wipx.c index f4b37f3e..20f550a4 100644 --- a/net_wipx.c +++ b/net_wipx.c @@ -24,8 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include "net_wipx.h" -extern cvar_t hostname; - #define MAXHOSTNAMELEN 256 static int net_acceptsocket = -1; // socket for fielding new connections diff --git a/palette.c b/palette.c index b574d802..47428dfc 100644 --- a/palette.c +++ b/palette.c @@ -12,7 +12,7 @@ cvar_t vid_gamma = {"vid_gamma", "1", true}; cvar_t vid_brightness = {"vid_brightness", "1", true}; cvar_t vid_contrast = {"vid_contrast", "1", true}; -void Palette_Setup8to24() +void Palette_Setup8to24(void) { byte *in, *out; unsigned short i; @@ -30,7 +30,7 @@ void Palette_Setup8to24() } /* -void Palette_Setup15to8() +void Palette_Setup15to8(void) { byte *pal; unsigned r,g,b; @@ -116,7 +116,7 @@ void BuildGammaTable16(float prescale, float gamma, float scale, float base, uns } } -void Texture_Gamma () +void Texture_Gamma (void) { int i, adjusted; double invgamma; @@ -174,14 +174,14 @@ void VID_UpdateGamma(qboolean force) Con_Printf("Hardware gamma not supported.\n"); } -void Gamma_Init() +void Gamma_Init(void) { Cvar_RegisterVariable(&vid_gamma); Cvar_RegisterVariable(&vid_brightness); Cvar_RegisterVariable(&vid_contrast); } -void Palette_Init() +void Palette_Init(void) { byte *pal; pal = (byte *)COM_LoadMallocFile ("gfx/palette.lmp", false); diff --git a/palette.h b/palette.h index 7e6dbc4b..9fd075c1 100644 --- a/palette.h +++ b/palette.h @@ -15,5 +15,5 @@ void VID_UpdateGamma(qboolean force); void BuildGammaTable8(float prescale, float gamma, float scale, float base, byte *out); void BuildGammaTable16(float prescale, float gamma, float scale, float base, unsigned short *out); -void Gamma_Init(); -void Palette_Init(); +void Gamma_Init(void); +void Palette_Init(void); diff --git a/pr_edict.c b/pr_edict.c index 0a472da0..cec47e82 100644 --- a/pr_edict.c +++ b/pr_edict.c @@ -127,7 +127,7 @@ int FindFieldOffset(char *field) return d->ofs*4; } -void FindEdictFieldOffsets() +void FindEdictFieldOffsets(void) { eval_gravity = FindFieldOffset("gravity"); eval_button3 = FindFieldOffset("button3"); diff --git a/progs.h b/progs.h index bd8eada0..2264ac11 100644 --- a/progs.h +++ b/progs.h @@ -94,6 +94,10 @@ extern int eval_punchvector; #define GETEDICTFIELDVALUE(ed, fieldoffset) (fieldoffset ? (eval_t*)((char*)&ed->v + fieldoffset) : NULL) + +extern dfunction_t *SV_PlayerPhysicsQC; +extern dfunction_t *EndFrameQC; + //============================================================================ extern dprograms_t *progs; diff --git a/quakedef.h b/quakedef.h index 4bd91859..499acbbb 100644 --- a/quakedef.h +++ b/quakedef.h @@ -261,7 +261,7 @@ extern double realtime; // not bounded in any way, changed at void Host_ClearMemory (void); void Host_ServerFrame (void); void Host_InitCommands (void); -void Host_Init (); +void Host_Init (void); void Host_Shutdown(void); void Host_Error (char *error, ...); void Host_EndGame (char *message, ...); diff --git a/r_crosshairs.c b/r_crosshairs.c index ef7e5c64..2884c24c 100644 --- a/r_crosshairs.c +++ b/r_crosshairs.c @@ -109,7 +109,7 @@ void crosshairload(int num, byte *in) crosshairtex[num] = R_LoadTexture(va("crosshair%02d", num), 16, 16, &data[0][0], TEXF_ALPHA | TEXF_RGBA | TEXF_PRECACHE); } -void r_crosshairs_start() +void r_crosshairs_start(void) { int i; for (i = 0;i < NUMCROSSHAIRS;i++) @@ -117,15 +117,15 @@ void r_crosshairs_start() // crosshairtex[1] = crosshairload(crosshairtex2); } -void r_crosshairs_shutdown() +void r_crosshairs_shutdown(void) { } -void r_crosshairs_newmap() +void r_crosshairs_newmap(void) { } -void R_Crosshairs_Init() +void R_Crosshairs_Init(void) { Cvar_RegisterVariable(&crosshair_brightness); Cvar_RegisterVariable(&crosshair_alpha); diff --git a/r_decals.c b/r_decals.c index d35eb587..f920b2ab 100644 --- a/r_decals.c +++ b/r_decals.c @@ -41,25 +41,25 @@ int currentdecal; // wraps around in decal array, replacing old ones when a new cvar_t r_drawdecals = {"r_drawdecals", "1"}; cvar_t r_decals_lighting = {"r_decals_lighting", "1"}; -void r_decals_start() +void r_decals_start(void) { decals = (decal_t *) qmalloc(MAX_DECALS * sizeof(decal_t)); memset(decals, 0, MAX_DECALS * sizeof(decal_t)); currentdecal = 0; } -void r_decals_shutdown() +void r_decals_shutdown(void) { qfree(decals); } -void r_decals_newmap() +void r_decals_newmap(void) { memset(decals, 0, MAX_DECALS * sizeof(decal_t)); currentdecal = 0; } -void R_Decals_Init() +void R_Decals_Init(void) { Cvar_RegisterVariable (&r_drawdecals); Cvar_RegisterVariable (&r_decals_lighting); diff --git a/r_decals.h b/r_decals.h index 8a54e8d9..9d2924cb 100644 --- a/r_decals.h +++ b/r_decals.h @@ -1,6 +1,6 @@ -void R_Decals_Init(); +void R_Decals_Init(void); -void GL_DrawDecals(); +void GL_DrawDecals(void); void R_Decal(vec3_t org, rtexture_t *tex, float scale, int cred, int cgreen, int cblue, int alpha); diff --git a/r_explosion.c b/r_explosion.c index 0350ac72..74e7dd42 100644 --- a/r_explosion.c +++ b/r_explosion.c @@ -72,7 +72,7 @@ int R_ExplosionVert(int column, int row) return i; } -void r_explosion_start() +void r_explosion_start(void) { int x, y; byte noise1[128][128], noise2[128][128], data[128][128][4]; @@ -101,16 +101,16 @@ void r_explosion_start() explosiontexturefog = R_LoadTexture ("explosiontexturefog", 128, 128, &data[0][0][0], TEXF_MIPMAP | TEXF_ALPHA | TEXF_RGBA | TEXF_PRECACHE); } -void r_explosion_shutdown() +void r_explosion_shutdown(void) { } -void r_explosion_newmap() +void r_explosion_newmap(void) { memset(explosion, 0, sizeof(explosion)); } -void R_Explosion_Init() +void R_Explosion_Init(void) { int i, x, y; i = 0; @@ -240,7 +240,7 @@ void R_MoveExplosion(explosion_t *e, float frametime) } } -void R_MoveExplosions() +void R_MoveExplosions(void) { int i; float frametime; @@ -259,7 +259,7 @@ void R_MoveExplosions() } } -void R_DrawExplosions() +void R_DrawExplosions(void) { int i; if (!r_drawexplosions.value) diff --git a/r_light.c b/r_light.c index 8f7b9837..168efc5d 100644 --- a/r_light.c +++ b/r_light.c @@ -23,21 +23,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. cvar_t r_lightmodels = {"r_lightmodels", "1"}; -extern cvar_t gl_transform; - -void r_light_start() +void r_light_start(void) { } -void r_light_shutdown() +void r_light_shutdown(void) { } -void r_light_newmap() +void r_light_newmap(void) { } -void R_Light_Init() +void R_Light_Init(void) { Cvar_RegisterVariable(&r_lightmodels); R_RegisterModule("R_Light", r_light_start, r_light_shutdown, r_light_newmap); @@ -421,8 +419,6 @@ LIGHT SAMPLING mplane_t *lightplane; vec3_t lightspot; -extern cvar_t r_ambient; - /* int RecursiveLightPoint (vec3_t color, mnode_t *node, vec3_t start, vec3_t end) { @@ -790,10 +786,6 @@ void R_DynamicLightPointNoMask(vec3_t color, vec3_t org) } */ -extern float *aliasvert; -extern float *aliasvertnorm; -extern byte *aliasvertcolor; -extern float modelalpha; void R_LightModel(entity_t *ent, int numverts, vec3_t center, vec3_t basecolor) { // LordHavoc: warning: reliance on int being 4 bytes here (of course the d_8to24table relies on that too...) diff --git a/r_modules.c b/r_modules.c index 69086f67..969519a6 100644 --- a/r_modules.c +++ b/r_modules.c @@ -7,22 +7,22 @@ typedef struct rendermodule_s { int active; // set by start, cleared by shutdown char *name; - void(*start)(); - void(*shutdown)(); - void(*newmap)(); + void(*start)(void); + void(*shutdown)(void); + void(*newmap)(void); } rendermodule_t; rendermodule_t rendermodule[MAXRENDERMODULES]; -void R_Modules_Init() +void R_Modules_Init(void) { int i; for (i = 0;i < MAXRENDERMODULES;i++) rendermodule[i].name = NULL; } -void R_RegisterModule(char *name, void(*start)(), void(*shutdown)(), void(*newmap)()) +void R_RegisterModule(char *name, void(*start)(void), void(*shutdown)(void), void(*newmap)(void)) { int i; for (i = 0;i < MAXRENDERMODULES;i++) @@ -41,7 +41,7 @@ void R_RegisterModule(char *name, void(*start)(), void(*shutdown)(), void(*newma rendermodule[i].newmap = newmap; } -void R_Modules_Start () +void R_Modules_Start(void) { int i; for (i = 0;i < MAXRENDERMODULES;i++) @@ -55,7 +55,7 @@ void R_Modules_Start () } } -void R_Modules_Shutdown () +void R_Modules_Shutdown(void) { int i; for (i = 0;i < MAXRENDERMODULES;i++) @@ -69,13 +69,13 @@ void R_Modules_Shutdown () } } -void R_Modules_Restart () +void R_Modules_Restart(void) { R_Modules_Shutdown(); R_Modules_Start(); } -void R_Modules_NewMap () +void R_Modules_NewMap(void) { int i; for (i = 0;i < MAXRENDERMODULES;i++) diff --git a/r_modules.h b/r_modules.h index 72f41572..93c8d3f4 100644 --- a/r_modules.h +++ b/r_modules.h @@ -1,7 +1,7 @@ -void R_Modules_Init(); -void R_RegisterModule(char *name, void(*start)(), void(*shutdown)(), void(*newmap)()); -void R_Modules_Start(); -void R_Modules_Shutdown(); -void R_Modules_NewMap(); -void R_Modules_Restart(); +void R_Modules_Init(void); +void R_RegisterModule(char *name, void(*start)(void), void(*shutdown)(void), void(*newmap)(void)); +void R_Modules_Start(void); +void R_Modules_Shutdown(void); +void R_Modules_NewMap(void); +void R_Modules_Restart(void); diff --git a/r_part.c b/r_part.c index e41be9f9..fa9ec93c 100644 --- a/r_part.c +++ b/r_part.c @@ -262,7 +262,7 @@ void R_InitParticleTexture (void) rocketglowparticletexture = R_LoadTexture ("glowparticletexture", 32, 32, &data[0][0][0], TEXF_MIPMAP | TEXF_ALPHA | TEXF_RGBA | TEXF_PRECACHE); } -void r_part_start() +void r_part_start(void) { particles = (particle_t *) qmalloc(r_numparticles * sizeof(particle_t)); freeparticles = (void *) qmalloc(r_numparticles * sizeof(particle_t *)); @@ -270,14 +270,14 @@ void r_part_start() R_InitParticleTexture (); } -void r_part_shutdown() +void r_part_shutdown(void) { numparticles = 0; qfree(particles); qfree(freeparticles); } -void r_part_newmap() +void r_part_newmap(void) { numparticles = 0; } @@ -1013,8 +1013,6 @@ void R_RocketTrail2 (vec3_t start, vec3_t end, int color, entity_t *ent) R_DrawParticles =============== */ -extern cvar_t sv_gravity; - void R_MoveParticles (void) { particle_t *p; diff --git a/render.h b/render.h index 2d22fd4c..56114375 100644 --- a/render.h +++ b/render.h @@ -20,6 +20,48 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // refresh.h -- public interface to refresh functions +// sky stuff +extern char skyname[]; +extern void R_SetSkyBox(char* sky); +extern void LoadSky_f(void); +extern rtexture_t *solidskytexture; +extern rtexture_t *alphaskytexture; +extern float speedscale; // for top sky and bottom sky + +// far clip distance for scene +extern cvar_t r_farclip; + +// fog stuff +extern void FOG_clear(void); +extern float fog_density, fog_red, fog_green, fog_blue; + +// SHOWLMP stuff (Nehahra) +extern void SHOWLMP_decodehide(void); +extern void SHOWLMP_decodeshow(void); +extern void SHOWLMP_drawall(void); +extern void SHOWLMP_clear(void); + +// render profiling stuff +extern qboolean intimerefresh; +extern cvar_t r_speeds2; +extern char r_speeds2_string1[81], r_speeds2_string2[81], r_speeds2_string3[81], r_speeds2_string4[81], r_speeds2_string5[81], r_speeds2_string6[81], r_speeds2_string7[81]; + +// lighting stuff +extern vec3_t lightspot; +extern cvar_t r_ambient; + +// model rendering stuff +extern float *aliasvert; +extern float *aliasvertnorm; +extern byte *aliasvertcolor; +extern float modelalpha; + +// vis stuff +extern cvar_t r_novis; + +// model transform stuff +extern cvar_t gl_transform; + #define TOP_RANGE 16 // soldier uniform colors #define BOTTOM_RANGE 96 diff --git a/server.h b/server.h index 426291af..5fbb3f71 100644 --- a/server.h +++ b/server.h @@ -183,21 +183,34 @@ typedef struct client_s //============================================================================ -extern cvar_t teamplay; -extern cvar_t skill; -extern cvar_t deathmatch; -extern cvar_t coop; -extern cvar_t fraglimit; -extern cvar_t timelimit; - -extern server_static_t svs; // persistant server info -extern server_t sv; // local server - -extern client_t *host_client; - -extern jmp_buf host_abortserver; - -extern edict_t *sv_player; +extern cvar_t teamplay; +extern cvar_t skill; +extern cvar_t deathmatch; +extern cvar_t coop; +extern cvar_t fraglimit; +extern cvar_t timelimit; +extern cvar_t pausable; +extern cvar_t sv_deltacompress; +extern cvar_t sv_maxvelocity; +extern cvar_t sv_gravity; +extern cvar_t sv_nostep; +extern cvar_t sv_friction; +extern cvar_t sv_edgefriction; +extern cvar_t sv_stopspeed; +extern cvar_t sv_maxspeed; +extern cvar_t sv_accelerate; +extern cvar_t sv_idealpitchscale; +extern cvar_t sv_aim; +extern cvar_t sv_predict; + +extern server_static_t svs; // persistant server info +extern server_t sv; // local server + +extern client_t *host_client; + +extern jmp_buf host_abortserver; + +extern edict_t *sv_player; //=========================================================== @@ -235,5 +248,5 @@ void SV_MoveToGoal (void); void SV_CheckForNewClients (void); void SV_RunClients (void); -void SV_SaveSpawnparms (); +void SV_SaveSpawnparms (void); void SV_SpawnServer (char *server); diff --git a/snd_alsa_0_9.c b/snd_alsa_0_9.c index 49b6bb87..9ab93d3d 100644 --- a/snd_alsa_0_9.c +++ b/snd_alsa_0_9.c @@ -218,7 +218,7 @@ qboolean SNDDMA_Init(void) } static inline int -get_hw_ptr() +get_hw_ptr(void) { size_t app_ptr; snd_pcm_sframes_t delay; diff --git a/snd_mix.c b/snd_mix.c index 7444857f..42e463fc 100644 --- a/snd_mix.c +++ b/snd_mix.c @@ -36,7 +36,6 @@ short *snd_out; void Snd_WriteLinearBlastStereo16 (void); -extern cvar_t snd_swapstereo; void Snd_WriteLinearBlastStereo16 (void) { int i; diff --git a/sound.h b/sound.h index 3c9f980a..4e8cafca 100644 --- a/sound.h +++ b/sound.h @@ -130,12 +130,12 @@ void SNDDMA_Shutdown(void); #define MAX_DYNAMIC_CHANNELS 128 -extern channel_t channels[MAX_CHANNELS]; +extern channel_t channels[MAX_CHANNELS]; // 0 to MAX_DYNAMIC_CHANNELS-1 = normal entity sounds // MAX_DYNAMIC_CHANNELS to MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS -1 = water, etc // MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS to total_channels = static sounds -extern int total_channels; +extern int total_channels; // // Fake dma is a synchronous faking of the DMA progress used for @@ -143,10 +143,10 @@ extern int total_channels; // number of times S_Update() is called per second. // -extern qboolean fakedma; -extern int fakedma_updates; -extern int paintedtime; -extern int soundtime; +extern qboolean fakedma; +extern int fakedma_updates; +extern int paintedtime; +extern int soundtime; extern vec3_t listener_origin; extern vec3_t listener_forward; extern vec3_t listener_right; @@ -155,13 +155,14 @@ extern volatile dma_t *shm; extern volatile dma_t sn; extern vec_t sound_nominal_clip_dist; -extern cvar_t loadas8bit; -extern cvar_t bgmvolume; -extern cvar_t volume; +extern cvar_t loadas8bit; +extern cvar_t bgmvolume; +extern cvar_t volume; +extern cvar_t snd_swapstereo; extern qboolean snd_initialized; -extern int snd_blocked; +extern int snd_blocked; void S_LocalSound (char *s); sfxcache_t *S_LoadSound (sfx_t *s); diff --git a/sv_main.c b/sv_main.c index 83f8ca52..ef29fbf2 100644 --- a/sv_main.c +++ b/sv_main.c @@ -26,8 +26,6 @@ server_static_t svs; char localmodels[MAX_MODELS][5]; // inline model names for precache -extern cvar_t sv_deltacompress; - //============================================================================ /* @@ -37,18 +35,7 @@ SV_Init */ void SV_Init (void) { - int i; - extern cvar_t sv_maxvelocity; - extern cvar_t sv_gravity; - extern cvar_t sv_nostep; - extern cvar_t sv_friction; - extern cvar_t sv_edgefriction; - extern cvar_t sv_stopspeed; - extern cvar_t sv_maxspeed; - extern cvar_t sv_accelerate; - extern cvar_t sv_idealpitchscale; - extern cvar_t sv_aim; - extern cvar_t sv_predict; + int i; Cvar_RegisterVariable (&sv_maxvelocity); Cvar_RegisterVariable (&sv_gravity); @@ -63,7 +50,7 @@ void SV_Init (void) Cvar_RegisterVariable (&sv_predict); Cvar_RegisterVariable (&sv_deltacompress); - for (i=0 ; i"); - M_Print (3*8, 36 + MODE_AREA_HEIGHT * 8 + 8*4, - "and -bpp "); - M_Print (3*8, 36 + MODE_AREA_HEIGHT * 8 + 8*6, - "Select windowed mode with -window"); + M_Print (3*8, 36 + MODE_AREA_HEIGHT * 8 + 8*2, "Video modes must be set from the"); + M_Print (3*8, 36 + MODE_AREA_HEIGHT * 8 + 8*3, "command line with -width "); + M_Print (3*8, 36 + MODE_AREA_HEIGHT * 8 + 8*4, "and -bpp "); + M_Print (3*8, 36 + MODE_AREA_HEIGHT * 8 + 8*6, "Select windowed mode with -window"); } diff --git a/view.c b/view.c index a8821d1b..5b0da1ee 100644 --- a/view.c +++ b/view.c @@ -61,8 +61,6 @@ cvar_t gl_polyblend = {"gl_polyblend", "1", true}; float v_dmg_time, v_dmg_roll, v_dmg_pitch; -extern int in_forward, in_forward2, in_back; - /* =============== @@ -729,7 +727,6 @@ V_CalcRefdef ================== */ -extern qboolean intimerefresh; void V_CalcRefdef (void) { entity_t *ent, *view; -- 2.39.2