ref: 8df091912bc7d1aa881361ee3d4bce7841434b1d
parent: cd99f1b0c46e1dfae46a510a610a24aea56858c2
parent: 604ac99cdd6124470338b772a69fec26a3e20f54
author: Turo Lamminen <turol@users.noreply.github.com>
date: Thu Nov 3 06:10:12 EDT 2022
Merge pull request #1536 from turol/extern-doom Clean up extern in Doom, part 0
--- a/src/doom/d_main.c
+++ b/src/doom/d_main.c
@@ -104,9 +104,6 @@
boolean respawnparm; // checkparm of -respawn
boolean fastparm; // checkparm of -fast
-//extern int soundVolume;
-//extern int sfxVolume;
-//extern int musicVolume;
extern boolean inhelpscreens;
@@ -1469,8 +1466,8 @@
if ( (p=M_CheckParm ("-turbo")) ) {int scale = 200;
- extern int forwardmove[2];
- extern int sidemove[2];
+ extern fixed_t forwardmove[2];
+ extern fixed_t sidemove[2];
if (p<myargc-1)
scale = atoi (myargv[p+1]);
--- a/src/doom/g_game.c
+++ b/src/doom/g_game.c
@@ -941,7 +941,7 @@
&& turbodetected[i])
{static char turbomessage[80];
- extern char *player_names[4];
+ extern const char *player_names[4];
M_snprintf(turbomessage, sizeof(turbomessage),
"%s is turbo!", player_names[i]);
players[consoleplayer].message = turbomessage;
@@ -1334,7 +1334,7 @@
// G_DoCompleted
//
boolean secretexit;
-extern char* pagename;
+extern const char *pagename;
void G_ExitLevel (void)
{ --- a/src/doom/g_game.h
+++ b/src/doom/g_game.h
@@ -23,6 +23,7 @@
#include "doomdef.h"
#include "d_event.h"
#include "d_ticcmd.h"
+#include "m_fixed.h"
//
--- a/src/doom/hu_lib.c
+++ b/src/doom/hu_lib.c
@@ -20,6 +20,7 @@
#include "doomdef.h"
#include "doomkeys.h"
+#include "doomstat.h"
#include "v_video.h"
#include "i_swap.h"
@@ -31,7 +32,6 @@
// boolean : whether the screen is always erased
#define noterased viewwindowx
-extern boolean automapactive; // in AM_map.c
void HUlib_init(void)
{--- a/src/doom/hu_stuff.c
+++ b/src/doom/hu_stuff.c
@@ -33,6 +33,7 @@
#include "hu_lib.h"
#include "m_controls.h"
#include "m_misc.h"
+#include "m_menu.h"
#include "w_wad.h"
#include "s_sound.h"
--- a/src/doom/hu_stuff.h
+++ b/src/doom/hu_stuff.h
@@ -19,6 +19,7 @@
#define __HU_STUFF_H__
#include "d_event.h"
+#include "v_patch.h"
//
--- a/src/doom/p_spec.c
+++ b/src/doom/p_spec.c
@@ -77,8 +77,6 @@
#define MAXANIMS 32
-extern anim_t anims[MAXANIMS];
-extern anim_t* lastanim;
//
// P_InitPicAnims
@@ -135,8 +133,8 @@
//
#define MAXLINEANIMS 64
-extern short numlinespecials;
-extern line_t* linespeciallist[MAXLINEANIMS];
+short numlinespecials;
+line_t *linespeciallist[MAXLINEANIMS];
@@ -1378,8 +1376,6 @@
// After the map has been loaded, scan for specials
// that spawn thinkers
//
-short numlinespecials;
-line_t* linespeciallist[MAXLINEANIMS];
static unsigned int NumScrollers()
{--- a/src/doom/st_lib.c
+++ b/src/doom/st_lib.c
@@ -36,12 +36,6 @@
#include "r_local.h"
-// in AM_map.c
-extern boolean automapactive;
-
-
-
-
//
// Hack display negative frags.
// Loads and store the stminus lump.