foxygit / doom Log in
commit 875a56814c08ef46159a4cf1841c8e2015fe546c
Author:     Turo Lamminen <turol@iki.fi>
AuthorDate: Tue Sep 13 19:08:32 2022 +0300
Commit:     Turo Lamminen <turol@iki.fi>
CommitDate: Fri Oct 7 13:14:28 2022 +0300

    hexen: Move NUMKEYS macro definition to h2def.h
---
 src/hexen/g_game.c  | 1 -
 src/hexen/h2def.h   | 4 ++++
 src/hexen/mn_menu.c | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/hexen/g_game.c b/src/hexen/g_game.c
index 43d4bc60..8426edeb 100644
--- a/src/hexen/g_game.c
+++ b/src/hexen/g_game.c
@@ -140,7 +140,6 @@ static int next_weapon = 0;

 #define SLOWTURNTICS    6

-#define NUMKEYS 256
 boolean gamekeydown[NUMKEYS];
 int turnheld;                   // for accelerative turning
 int lookheld;
diff --git a/src/hexen/h2def.h b/src/hexen/h2def.h
index c8ed7470..20e26e29 100644
--- a/src/hexen/h2def.h
+++ b/src/hexen/h2def.h
@@ -764,6 +764,10 @@ typedef struct
 //GAME
 //----

+
+#define NUMKEYS 256
+
+
 void G_DeathMatchSpawnPlayer(int playernum);

 void G_InitNew(skill_t skill, int episode, int map);
diff --git a/src/hexen/mn_menu.c b/src/hexen/mn_menu.c
index f7819035..26cdef82 100644
--- a/src/hexen/mn_menu.c
+++ b/src/hexen/mn_menu.c
@@ -125,7 +125,7 @@ void MN_LoadSlotText(void);
 // EXTERNAL DATA DECLARATIONS ----------------------------------------------

 extern int detailLevel;
-extern boolean gamekeydown[256];        // The NUMKEYS macro is local to g_game
+extern boolean gamekeydown[256];

 // PUBLIC DATA DEFINITIONS -------------------------------------------------