summaryrefslogtreecommitdiff
path: root/src/hexen
diff options
context:
space:
mode:
Diffstat (limited to 'src/hexen')
-rw-r--r--src/hexen/ct_chat.c5
-rw-r--r--src/hexen/g_game.c5
-rw-r--r--src/hexen/h2_main.c2
-rw-r--r--src/hexen/h2def.h19
-rw-r--r--src/hexen/in_lude.c7
-rw-r--r--src/hexen/mn_menu.c4
-rw-r--r--src/hexen/p_anim.c1
-rw-r--r--src/hexen/p_user.c7
-rw-r--r--src/hexen/po_man.c6
-rw-r--r--src/hexen/r_local.h2
-rw-r--r--src/hexen/r_things.c3
-rw-r--r--src/hexen/s_sound.c3
-rw-r--r--src/hexen/sb_bar.c3
-rw-r--r--src/hexen/st_start.h3
-rw-r--r--src/hexen/sv_save.c4
15 files changed, 6 insertions, 68 deletions
diff --git a/src/hexen/ct_chat.c b/src/hexen/ct_chat.c
index fab7582d..6ef39e44 100644
--- a/src/hexen/ct_chat.c
+++ b/src/hexen/ct_chat.c
@@ -56,11 +56,6 @@ enum
// Public data
-void CT_Init(void);
-void CT_Drawer(void);
-boolean CT_Responder(event_t * ev);
-void CT_Ticker(void);
-char CT_dequeueChatChar(void);
boolean chatmodeon;
diff --git a/src/hexen/g_game.c b/src/hexen/g_game.c
index 0118cd6b..707f2cac 100644
--- a/src/hexen/g_game.c
+++ b/src/hexen/g_game.c
@@ -48,14 +48,12 @@ extern void P_PlayerNextArtifact(player_t * player);
boolean G_CheckDemoStatus(void);
void G_ReadDemoTiccmd(ticcmd_t * cmd);
void G_WriteDemoTiccmd(ticcmd_t * cmd);
-void G_InitNew(skill_t skill, int episode, int map);
void G_DoReborn(int playernum);
void G_DoLoadLevel(void);
void G_DoInitNew(void);
void G_DoNewGame(void);
-void G_DoLoadGame(void);
void G_DoPlayDemo(void);
void G_DoTeleportNewMap(void);
void G_DoCompleted(void);
@@ -194,9 +192,6 @@ int testcontrols_mousespeed;
*/
extern boolean inventory;
-extern int curpos;
-extern int inv_ptr;
-
boolean usearti = true;
void G_BuildTiccmd(ticcmd_t *cmd, int maketic)
diff --git a/src/hexen/h2_main.c b/src/hexen/h2_main.c
index 49d7f21b..3d9ae87d 100644
--- a/src/hexen/h2_main.c
+++ b/src/hexen/h2_main.c
@@ -77,7 +77,6 @@ typedef struct
void R_ExecuteSetViewSize(void);
void D_CheckNetGame(void);
-void F_Drawer(void);
boolean F_Responder(event_t * ev);
void I_StartupKeyboard(void);
void I_StartupJoystick(void);
@@ -111,7 +110,6 @@ static void WarpCheck(void);
extern boolean automapactive;
extern boolean MenuActive;
extern boolean askforquit;
-extern char *SavePath;
// PUBLIC DATA DEFINITIONS -------------------------------------------------
diff --git a/src/hexen/h2def.h b/src/hexen/h2def.h
index 5960743c..95f3e554 100644
--- a/src/hexen/h2def.h
+++ b/src/hexen/h2def.h
@@ -655,8 +655,6 @@ extern int leveltime; // tics in game play for par
extern ticcmd_t *netcmds;
-extern int rndindex;
-
#define MAXDEATHMATCHSTARTS 16
extern mapthing_t *deathmatch_p;
extern mapthing_t deathmatchstarts[MAXDEATHMATCHSTARTS];
@@ -667,12 +665,6 @@ extern int RebornPosition;
#define MAX_PLAYER_STARTS 8
extern mapthing_t playerstarts[MAX_PLAYER_STARTS][MAXPLAYERS];
-extern int viewwindowx;
-extern int viewwindowy;
-extern int viewwidth;
-extern int scaledviewwidth;
-extern int viewheight;
-
extern int mouseSensitivity;
extern boolean precache; // if true, load all graphics at level load
@@ -717,22 +709,12 @@ void H2_GameLoop(void);
// calls all ?_Responder, ?_Ticker, and ?_Drawer functions
// calls I_GetTime, I_StartFrame, and I_StartTic
-void NetUpdate(void);
-// create any new ticcmds and broadcast to other players
-
-void D_QuitNetGame(void);
-// broadcasts special packets to other players to notify of game exit
-
-void TryRunTics(void);
-
//---------
//SYSTEM IO
//---------
byte *I_AllocLow(int length);
// allocates from low memory under dos, just mallocs under unix
-void I_Tactile(int on, int off, int total);
-
// haleyjd: was WATCOMC, again preserved for historical interest as in Heretic
#if 0
extern boolean useexterndriver;
@@ -1055,7 +1037,6 @@ void F_StartFinale(void);
extern int inv_ptr;
extern int curpos;
-extern int SB_state;
void SB_Init(void);
void SB_SetClassData(void);
boolean SB_Responder(event_t * event);
diff --git a/src/hexen/in_lude.c b/src/hexen/in_lude.c
index 8e95596d..4164d549 100644
--- a/src/hexen/in_lude.c
+++ b/src/hexen/in_lude.c
@@ -22,12 +22,13 @@
//
//-----------------------------------------------------------------------------
+#include <ctype.h>
#include "h2def.h"
#include "s_sound.h"
#include "i_system.h"
#include "i_video.h"
-#include <ctype.h>
+#include "p_local.h"
#include "v_video.h"
// MACROS ------------------------------------------------------------------
@@ -48,10 +49,6 @@ typedef enum
// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
-void IN_Start(void);
-void IN_Ticker(void);
-void IN_Drawer(void);
-
// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
static void WaitStop(void);
diff --git a/src/hexen/mn_menu.c b/src/hexen/mn_menu.c
index 32458a1e..301c5c1d 100644
--- a/src/hexen/mn_menu.c
+++ b/src/hexen/mn_menu.c
@@ -129,8 +129,6 @@ void MN_LoadSlotText(void);
// EXTERNAL DATA DECLARATIONS ----------------------------------------------
extern int detailLevel;
-extern char *SavePath;
-extern int key_speed, key_strafe;
extern boolean gamekeydown[256]; // The NUMKEYS macro is local to g_game
// PUBLIC DATA DEFINITIONS -------------------------------------------------
@@ -1012,8 +1010,6 @@ static void SCClass(int option)
static void SCSkill(int option)
{
- extern int SB_state;
-
PlayerClass[consoleplayer] = MenuPClass;
G_DeferredNewGame(option);
SB_SetClassData();
diff --git a/src/hexen/p_anim.c b/src/hexen/p_anim.c
index c23c95fa..7655aef2 100644
--- a/src/hexen/p_anim.c
+++ b/src/hexen/p_anim.c
@@ -78,7 +78,6 @@ static void P_LightningFlash(void);
extern fixed_t Sky1ColumnOffset;
extern fixed_t Sky2ColumnOffset;
-extern int Sky1Texture;
extern boolean DoubleSky;
// PUBLIC DATA DEFINITIONS -------------------------------------------------
diff --git a/src/hexen/p_user.c b/src/hexen/p_user.c
index dd64315d..17c96a47 100644
--- a/src/hexen/p_user.c
+++ b/src/hexen/p_user.c
@@ -330,8 +330,6 @@ void P_DeathThink(player_t * player)
int dir;
angle_t delta;
int lookDelta;
- extern int inv_ptr;
- extern int curpos;
P_MovePsprites(player);
@@ -1336,9 +1334,6 @@ boolean P_HealRadius(player_t * player)
void P_PlayerNextArtifact(player_t * player)
{
- extern int inv_ptr;
- extern int curpos;
-
if (player == &players[consoleplayer])
{
inv_ptr--;
@@ -1375,8 +1370,6 @@ void P_PlayerNextArtifact(player_t * player)
void P_PlayerRemoveArtifact(player_t * player, int slot)
{
int i;
- extern int inv_ptr;
- extern int curpos;
player->artifactCount--;
if (!(--player->inventory[slot].count))
diff --git a/src/hexen/po_man.c b/src/hexen/po_man.c
index 50b79518..4429c3e0 100644
--- a/src/hexen/po_man.c
+++ b/src/hexen/po_man.c
@@ -40,10 +40,6 @@
// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
-boolean PO_MovePolyobj(int num, int x, int y);
-boolean PO_RotatePolyobj(int num, angle_t angle);
-void PO_Init(int lump);
-
// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
static polyobj_t *GetPolyobj(int polyNum);
@@ -62,8 +58,6 @@ static void TranslateToStartSpot(int tag, int originX, int originY);
// EXTERNAL DATA DECLARATIONS ----------------------------------------------
-extern seg_t *segs;
-
// PUBLIC DATA DEFINITIONS -------------------------------------------------
polyblock_t **PolyBlockMap;
diff --git a/src/hexen/r_local.h b/src/hexen/r_local.h
index e030bcef..8e34ea63 100644
--- a/src/hexen/r_local.h
+++ b/src/hexen/r_local.h
@@ -336,6 +336,7 @@ extern angle_t rw_normalangle;
//
extern int screenblocks;
extern int viewwidth, viewheight, viewwindowx, viewwindowy;
+extern int scaledviewwidth;
extern int centerx, centery;
extern int flyheight;
extern fixed_t centerxfrac;
@@ -456,7 +457,6 @@ extern fixed_t *spritewidth; // needed for pre rendering (fracs)
extern fixed_t *spriteoffset;
extern fixed_t *spritetopoffset;
extern lighttable_t *colormaps;
-extern int viewwidth, scaledviewwidth, viewheight;
extern int firstflat;
extern int numflats;
diff --git a/src/hexen/r_things.c b/src/hexen/r_things.c
index e59c7053..6cc0c6a5 100644
--- a/src/hexen/r_things.c
+++ b/src/hexen/r_things.c
@@ -30,9 +30,6 @@
#include "i_swap.h"
#include "r_local.h"
-void R_DrawColumn(void);
-void R_DrawTLColumn(void);
-void R_DrawAltTLColumn(void);
//void R_DrawTranslatedAltTLColumn(void);
typedef struct
diff --git a/src/hexen/s_sound.c b/src/hexen/s_sound.c
index f11e4ee9..b06a8d4b 100644
--- a/src/hexen/s_sound.c
+++ b/src/hexen/s_sound.c
@@ -77,9 +77,6 @@ int snd_MaxVolume = 10; // maximum volume for sound
int snd_MusicVolume = 10; // maximum volume for music
int snd_Channels = 16;
-extern int startepisode;
-extern int startmap;
-
// int AmbChan;
//==========================================================================
diff --git a/src/hexen/sb_bar.c b/src/hexen/sb_bar.c
index 01a2ef0c..bcaa40be 100644
--- a/src/hexen/sb_bar.c
+++ b/src/hexen/sb_bar.c
@@ -48,8 +48,6 @@ typedef struct Cheat_s
// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
-void SB_PaletteFlash(boolean forceChange);
-
// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
static void DrawSoundInfo(void);
@@ -84,7 +82,6 @@ static void CheatQuickenFunc3(player_t * player, Cheat_t * cheat);
static void CheatClassFunc1(player_t * player, Cheat_t * cheat);
static void CheatClassFunc2(player_t * player, Cheat_t * cheat);
static void CheatInitFunc(player_t * player, Cheat_t * cheat);
-static void CheatInitFunc(player_t * player, Cheat_t * cheat);
static void CheatVersionFunc(player_t * player, Cheat_t * cheat);
static void CheatDebugFunc(player_t * player, Cheat_t * cheat);
static void CheatScriptFunc1(player_t * player, Cheat_t * cheat);
diff --git a/src/hexen/st_start.h b/src/hexen/st_start.h
index 53cd85c9..be938b74 100644
--- a/src/hexen/st_start.h
+++ b/src/hexen/st_start.h
@@ -22,6 +22,8 @@
//
//-----------------------------------------------------------------------------
+#ifndef STSTART_H
+#define STSTART_H
// HEADER FILES ------------------------------------------------------------
@@ -42,3 +44,4 @@ extern void ST_NetDone(void);
extern int graphical_startup;
+#endif
diff --git a/src/hexen/sv_save.c b/src/hexen/sv_save.c
index bafa89d7..9dc8fc5d 100644
--- a/src/hexen/sv_save.c
+++ b/src/hexen/sv_save.c
@@ -145,10 +145,6 @@ static void StreamOutLong(unsigned int val);
// EXTERNAL DATA DECLARATIONS ----------------------------------------------
-extern int ACScriptCount;
-extern byte *ActionCodeBase;
-extern acsInfo_t *ACSInfo;
-
// PUBLIC DATA DEFINITIONS -------------------------------------------------
#define DEFAULT_SAVEPATH "hexndata/"