- Exhumed: Clean out the rest of input.cpp.

source/games/exhumed/all.cpp

@@ -11,7 +11,6 @@
 #include "src/grenade.cpp"
 #include "src/gun.cpp"
 #include "src/init.cpp"
-#include "src/input.cpp"
 #include "src/items.cpp"
 #include "src/lavadude.cpp"
 #include "src/light.cpp"

source/games/exhumed/src/2d.cpp

@@ -24,7 +24,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "status.h"
 #include "sound.h"
 #include "names.h"
-#include "input.h"
 #include "view.h"
 #include "raze_sound.h"
 #include "v_2ddrawer.h"

source/games/exhumed/src/cheats.cpp

@@ -22,7 +22,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "sequence.h"
 #include "names.h"
 #include "player.h"
-#include "input.h"
 #include "sound.h"
 #include "view.h"
 #include "status.h"
@@ -42,6 +41,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 BEGIN_PS_NS
 
+enum {
+    kButtonCheatGuns = 0x20,
+    kButtonCheatGodMode = 0x40,
+    kButtonCheatKeys = 0x80,
+    kButtonCheatItems = 0x100,
+};
 
 //---------------------------------------------------------------------------
 //

source/games/exhumed/src/exhumed.cpp

@@ -22,7 +22,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "sequence.h"
 #include "names.h"
 #include "player.h"
-#include "input.h"
 #include "sound.h"
 #include "view.h"
 #include "status.h"

source/games/exhumed/src/gameloop.cpp

@@ -21,7 +21,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "sequence.h"
 #include "names.h"
 #include "player.h"
-#include "input.h"
 #include "sound.h"
 #include "view.h"
 #include "status.h"

source/games/exhumed/src/gun.cpp

@@ -23,7 +23,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "view.h"
 #include "status.h"
 #include "sound.h"
-#include "input.h"
 #include <string.h>
 #include <assert.h>
 #include "v_2ddrawer.h"

source/games/exhumed/src/init.cpp

@@ -23,7 +23,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "engine.h"
 #include "sound.h"
 #include "exhumed.h"
-#include "input.h"
 #include "mapinfo.h"
 #include "gamecontrol.h"
 #include "v_video.h"

source/games/exhumed/src/input.cpp

@@ -1,40 +0,0 @@
-//-------------------------------------------------------------------------
-/*
-Copyright (C) 2010-2019 EDuke32 developers and contributors
-Copyright (C) 2019 sirlemonhead, Nuke.YKT
-This file is part of PCExhumed.
-PCExhumed is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License version 2
-as published by the Free Software Foundation.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-See the GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-//-------------------------------------------------------------------------
-#include "ns.h"
-#include "input.h"
-#include "exhumed.h"
-#include "player.h"
-#include "status.h"
-#include "view.h"
-#include "razemenu.h"
-
-BEGIN_PS_NS
-
-//---------------------------------------------------------------------------
-//
-//
-//
-//---------------------------------------------------------------------------
-
-void ClearSpaceBar(int nPlayer)
-{
-    PlayerList[nPlayer].input.actions &= SB_OPEN;
-    buttonMap.ClearButton(gamefunc_Open);
-}
-
-END_PS_NS

source/games/exhumed/src/input.h

@@ -1,35 +0,0 @@
-//-------------------------------------------------------------------------
-/*
-Copyright (C) 2010-2019 EDuke32 developers and contributors
-Copyright (C) 2019 sirlemonhead, Nuke.YKT
-This file is part of PCExhumed.
-PCExhumed is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License version 2
-as published by the Free Software Foundation.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-See the GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-//-------------------------------------------------------------------------
-
-#pragma once 
-
-#include "packet.h"
-
-BEGIN_PS_NS
-
-enum {
-    kButtonCheatGuns = 0x20,
-    kButtonCheatGodMode = 0x40,
-    kButtonCheatKeys = 0x80,
-    kButtonCheatItems = 0x100,
-};
-
-void ClearSpaceBar(int nPlayer);
-
-END_PS_NS
-

source/games/exhumed/src/items.cpp

@@ -22,7 +22,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "sound.h"
 #include "status.h"
 #include "engine.h"
-#include "input.h"
 #include "mapinfo.h"
 
 BEGIN_PS_NS

source/games/exhumed/src/menu.cpp

@@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "status.h"
 #include "sound.h"
 #include "names.h"
-#include "input.h"
 #include "view.h"
 #include "raze_sound.h"
 #include "v_2ddrawer.h"

source/games/exhumed/src/osdcmds.cpp

@@ -26,7 +26,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "view.h"
 #include "mapinfo.h"
 #include "aistuff.h"
-#include "input.h"
 #include "cheathandler.h"
 #include "gamestate.h"
 #include "gamefuncs.h"

source/games/exhumed/src/player.cpp

@@ -23,7 +23,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "engine.h"
 #include "sequence.h"
 #include "view.h"
-#include "input.h"
 #include "status.h"
 #include "sound.h"
 #include "sound.h"
@@ -872,6 +871,18 @@ bool CheckMovingBlocks(int nPlayer, Collision& nMove, DVector3& spr_pos, sectort
     return false;
 }
 
+//---------------------------------------------------------------------------
+//
+//
+//
+//---------------------------------------------------------------------------
+
+static void ClearSpaceBar(int nPlayer)
+{
+    PlayerList[nPlayer].input.actions &= SB_OPEN;
+    buttonMap.ClearButton(gamefunc_Open);
+}
+
 //---------------------------------------------------------------------------
 //
 // this function is pure spaghetti madness... :(

source/games/exhumed/src/ra.cpp

@@ -21,7 +21,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "exhumed.h"
 #include "player.h"
 #include "sequence.h"
-#include "input.h"
 #include <string.h>
 
 BEGIN_PS_NS

source/games/exhumed/src/ramses.cpp

@@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "aistuff.h"
 #include "player.h"
 #include "mapinfo.h"
-#include "input.h"
 
 
 BEGIN_PS_NS

source/games/exhumed/src/snake.cpp

@@ -22,7 +22,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "status.h"
 #include "player.h"
 #include "sequence.h"
-#include "input.h"
 #include "sound.h"
 #include <string.h>
 #include <assert.h>