shithub: choc

Download patch

ref: cd99f1b0c46e1dfae46a510a610a24aea56858c2
parent: e664067dd2b572420145b768fa2668e2a869d9a5
parent: e7c99127bb08225e30e28f6ae99ec3c511a96ce4
author: Turo Lamminen <turol@users.noreply.github.com>
date: Mon Oct 31 12:24:35 EDT 2022 

Merge pull request #1534 from turol/extern-heretic

Clean up extern in Heretic, part NaN


--- a/src/heretic/am_map.c
+++ b/src/heretic/am_map.c
@@ -146,8 +146,6 @@
 
 static byte cheatcount = 0;
 
-extern boolean viewactive;
-
 static byte antialias[NUMALIAS][8] = {
     {96, 97, 98, 99, 100, 101, 102, 103},
     {110, 109, 108, 107, 106, 105, 104, 103},
--- a/src/heretic/doomdef.h
+++ b/src/heretic/doomdef.h
@@ -508,6 +508,10 @@
 
 extern boolean cdrom;           // true if cd-rom mode active ("-cdrom")
 
+extern boolean noartiskip;      // whether shift-enter skips an artifact
+
+extern boolean viewactive;
+
 extern boolean deathmatch;      // only if started as net death
 
 extern boolean netgame;         // only true if >1 player
@@ -817,6 +821,7 @@
 extern boolean inventory;
 extern int curpos;
 extern int inv_ptr;
+extern int playerkeys;
 
 
 void SB_Init(void);
--- a/src/heretic/f_finale.c
+++ b/src/heretic/f_finale.c
@@ -36,8 +36,6 @@
 
 static int FontABaseLump;
 
-extern boolean viewactive;
-
 
 /*
 =======================
--- a/src/heretic/g_game.c
+++ b/src/heretic/g_game.c
@@ -291,8 +291,6 @@
     int look, arti;
     int flyheight;
 
-    extern boolean noartiskip;
-
     // haleyjd: removed externdriver crap
 
     memset(cmd, 0, sizeof(*cmd));
@@ -1216,7 +1214,6 @@
 = Can when a player completes a level
 ====================
 */
-extern int playerkeys;
 
 void G_PlayerFinishLevel(int player)
 {
--- a/src/heretic/p_inter.c
+++ b/src/heretic/p_inter.c
@@ -316,7 +316,6 @@
 
 void P_GiveKey(player_t * player, keytype_t key)
 {
-    extern int playerkeys;
 
     if (player->keys[key])
     {
--- a/src/heretic/p_mobj.c
+++ b/src/heretic/p_mobj.c
@@ -968,7 +968,6 @@
     fixed_t x, y, z;
     mobj_t *mobj;
     int i;
-    extern int playerkeys;
 
     if (!playeringame[mthing->type - 1])
         return;                 // not playing