diff --git a/source/sw/CMakeLists.txt b/source/sw/CMakeLists.txt
index 1a76c9ac5..1f8792d58 100644
--- a/source/sw/CMakeLists.txt
+++ b/source/sw/CMakeLists.txt
@@ -17,6 +17,7 @@ set( PCH_SOURCES
 	src/girlninj.cpp
 	src/goro.cpp
 	src/hornet.cpp
+	src/input.cpp
 	src/interp.cpp
 	src/interpsh.cpp
 	src/interpso.cpp
diff --git a/source/sw/src/draw.cpp b/source/sw/src/draw.cpp
index 148ddb213..3a052cfba 100644
--- a/source/sw/src/draw.cpp
+++ b/source/sw/src/draw.cpp
@@ -69,7 +69,6 @@ extern short f_c;
 extern short HelpPage;
 extern short HelpPagePic[];
 extern ParentalStruct aVoxelArray[MAXTILES];
-extern int Follow_posx,Follow_posy;
 
 int ConnectCopySprite(uspritetype const * tsp);
 void PreDrawStackedWater(void);
@@ -956,8 +955,6 @@ ResizeView(PLAYERp pp)
 #if 0
         if (inputState.GetKeyStatus(sc_Escape))
         {
-            extern SWBOOL ScrollMode2D;
-
 			inputState.ClearKeyStatus(sc_Escape);
             dimensionmode = 3;
             ScrollMode2D = FALSE;
@@ -1915,8 +1912,6 @@ drawscreen(PLAYERp pp)
 
     if ((dimensionmode == 5 || dimensionmode == 6) && pp == Player+myconnectindex)
     {
-        extern SWBOOL ScrollMode2D;
-
         if (ScrollMode2D)
         {
             tx = Follow_posx;
diff --git a/source/sw/src/game.cpp b/source/sw/src/game.cpp
index 356d8ec9c..c75062257 100644
--- a/source/sw/src/game.cpp
+++ b/source/sw/src/game.cpp
@@ -92,8 +92,6 @@ BEGIN_SW_NS
 void pClearSpriteList(PLAYERp pp);
 extern SWBOOL mapcheat;
 
-extern SWBOOL MultiPlayQuitFlag;
-
 extern int sw_snd_scratch;
 
 char DemoName[15][16];
@@ -117,7 +115,6 @@ SWBOOL InMenuLevel = FALSE;
 SWBOOL LoadGameOutsideMoveLoop = FALSE;
 SWBOOL LoadGameFromDemo = FALSE;
 extern SWBOOL NetBroadcastMode, NetModeOverride;
-SWBOOL MultiPlayQuitFlag = FALSE;
 //Miscellaneous variables
 char MessageInputString[256];
 char MessageOutputString[256];
@@ -576,6 +573,8 @@ InitLevel(void)
 void
 TerminateLevel(void)
 {
+    if (!currentLevel) return;
+
     int i, nexti, stat, pnum, ndx;
     SECT_USERp *sectu;
 
@@ -1156,45 +1155,20 @@ static const char* actions[] = {
     "Strafe_Right",
     "Aim_Up",
     "Aim_Down",
-    "Weapon_1",
-    "Weapon_2",
-    "Weapon_3",
-    "Weapon_4",
-    "Weapon_5",
-    "Weapon_6",
-    "Weapon_7",
-    "Weapon_8",
-    "Weapon_9",
-    "Weapon_10",
-    "Inventory",
-    "Inventory_Left",
-    "Inventory_Right",
-    "NightVision",
-    "MedKit",
-    "TurnAround",
     "SendMessage",
     "Map",
     "Shrink_Screen",
     "Enlarge_Screen",
-    "Center_View",
-    "Holster_Weapon",
     "Show_Opponents_Weapon",
     "Map_Follow_Mode",
     "See_Coop_View",
     "Mouse_Aiming",
-    "Toggle_Crosshair",
-    "Next_Weapon",
-    "Previous_Weapon",
     "Dpad_Select",
     "Dpad_Aiming",
     "Last_Weapon",
     "Alt_Weapon",
     "Third_Person_View",
     "Toggle_Crouch",	// This is the last one used by EDuke32"",
-    "Smoke_Bomb",
-    "Gas_Bomb",
-    "Flash_Bomb",
-    "Caltrops",
 
 };
 
@@ -1233,6 +1207,7 @@ int32_t GameInterface::app_main()
         Printf("Copyright (c) 1997 3D Realms Entertainment\n");
 
     registerosdcommands();
+    registerinputcommands();
 
     Control();
 
@@ -1335,540 +1310,6 @@ ManualPlayerDelete(void)
 
 char WangBangMacro[10][64];
 
-void
-FunctionKeys(PLAYERp pp)
-{
-    static int rts_delay = 0;
-    int fn_key = 0;
-
-    rts_delay++;
-
-    if (inputState.GetKeyStatus(sc_F1))   { fn_key = 1; }
-    if (inputState.GetKeyStatus(sc_F2))   { fn_key = 2; }
-    if (inputState.GetKeyStatus(sc_F3))   { fn_key = 3; }
-    if (inputState.GetKeyStatus(sc_F4))   { fn_key = 4; }
-    if (inputState.GetKeyStatus(sc_F5))   { fn_key = 5; }
-    if (inputState.GetKeyStatus(sc_F6))   { fn_key = 6; }
-    if (inputState.GetKeyStatus(sc_F7))   { fn_key = 7; }
-    if (inputState.GetKeyStatus(sc_F8))   { fn_key = 8; }
-    if (inputState.GetKeyStatus(sc_F9))   { fn_key = 9; }
-    if (inputState.GetKeyStatus(sc_F10))  { fn_key = 10; }
-
-    if (inputState.AltPressed())
-    {
-        if (rts_delay > 16 && fn_key && !adult_lockout)
-        {
-			inputState.ClearKeyStatus(sc_F1 + fn_key - 1);
-            rts_delay = 0;
-            PlaySoundRTS(fn_key);
-        }
-
-        return;
-    }
-
-    if (inputState.ShiftPressed())
-    {
-        if (fn_key)
-        {
-			inputState.ClearKeyStatus(sc_F1 + fn_key - 1);
-        }
-
-        return;
-    }
-
-    // F7 VIEW control
-	if (buttonMap.ButtonDown(gamefunc_Third_Person_View))
-    {
-		buttonMap.ClearButton(gamefunc_Third_Person_View);
-
-        if (SHIFTS_IS_PRESSED)
-        {
-            if (TEST(pp->Flags, PF_VIEW_FROM_OUTSIDE))
-                pp->view_outside_dang = NORM_ANGLE(pp->view_outside_dang + 256);
-        }
-        else
-        {
-            if (TEST(pp->Flags, PF_VIEW_FROM_OUTSIDE))
-            {
-                RESET(pp->Flags, PF_VIEW_FROM_OUTSIDE);
-            }
-            else
-            {
-                SET(pp->Flags, PF_VIEW_FROM_OUTSIDE);
-                pp->camera_dist = 0;
-            }
-        }
-    }
-}
-
-short MirrorDelay;
-
-double elapsedInputTicks;
-double scaleAdjustmentToInterval(double x) { return x * (120 / synctics) / (1000.0 / elapsedInputTicks); }
-
-void DoPlayerTurn(PLAYERp pp, fix16_t *pq16ang, fix16_t q16angvel);
-void DoPlayerHorizon(PLAYERp pp, fix16_t *pq16horiz, fix16_t q16aimvel);
-
-void
-getinput(SW_PACKET *loc, SWBOOL tied)
-{
-    int i;
-    PLAYERp pp = Player + myconnectindex;
-    PLAYERp newpp = Player + myconnectindex;
-    int inv_hotkey = 0;
-
-#define TURBOTURNTIME (120/8)
-#define NORMALTURN   (12+6)
-#define RUNTURN      (28)
-#define PREAMBLETURN 3
-#define NORMALKEYMOVE 35
-#define MAXVEL       ((NORMALKEYMOVE*2)+10)
-#define MAXSVEL      ((NORMALKEYMOVE*2)+10)
-#define MAXANGVEL    100
-#define MAXHORIZVEL  128
-#define SET_LOC_KEY(loc, sync_num, key_test) SET(loc, ((!!(key_test)) << (sync_num)))
-
-    static int32_t turnheldtime;
-    int32_t momx, momy;
-
-    extern SWBOOL MenuButtonAutoAim;
-
-    if (Prediction && CommEnabled)
-    {
-        newpp = ppp;
-    }
-
-    static double lastInputTicks;
-
-    auto const currentHiTicks = timerGetHiTicks();
-    elapsedInputTicks = currentHiTicks - lastInputTicks;
-
-    lastInputTicks = currentHiTicks;
-
-    // MAKE SURE THIS WILL GET SET
-    SET_LOC_KEY(loc->bits, SK_QUIT_GAME, MultiPlayQuitFlag);
-
-    bool mouseaim = in_mousemode || buttonMap.ButtonDown(gamefunc_Mouse_Aiming);
-
-    if (!CommEnabled)
-    {
-        // Go back to the source to set this - the old code here was catastrophically bad.
-        // this needs to be fixed properly - as it is this can never be compatible with demo playback.
-
-        if (mouseaim)
-            SET(Player[myconnectindex].Flags, PF_MOUSE_AIMING_ON);
-        else
-            RESET(Player[myconnectindex].Flags, PF_MOUSE_AIMING_ON);
-
-        if (cl_autoaim)
-            SET(Player[myconnectindex].Flags, PF_AUTO_AIM);
-        else
-            RESET(Player[myconnectindex].Flags, PF_AUTO_AIM);
-    }
-
-    ControlInfo info;
-    CONTROL_GetInput(&info);
-
-    if (paused)
-        return;
-
-    // MAP KEY
-    if (buttonMap.ButtonDown(gamefunc_Map))
-    {
-        buttonMap.ClearButton(gamefunc_Map);
-
-        // Init follow coords
-        Follow_posx = pp->posx;
-        Follow_posy = pp->posy;
-
-        if (dimensionmode == 3)
-            dimensionmode = 5;
-        else if (dimensionmode == 5)
-            dimensionmode = 6;
-        else
-        {
-            MirrorDelay = 1;
-            dimensionmode = 3;
-            ScrollMode2D = FALSE;
-        }
-    }
-
-    // Toggle follow map mode on/off
-    if (dimensionmode == 5 || dimensionmode == 6)
-    {
-        if (buttonMap.ButtonDown(gamefunc_Map_Follow_Mode))
-        {
-			buttonMap.ClearButton(gamefunc_Map_Follow_Mode);
-            ScrollMode2D = !ScrollMode2D;
-            Follow_posx = pp->posx;
-            Follow_posy = pp->posy;
-        }
-    }
-
-    // If in 2D follow mode, scroll around using glob vars
-    // Tried calling this in domovethings, but key response it too poor, skips key presses
-    // Note: ScrollMode2D = Follow mode, so this get called only during follow mode
-    if (!tied && ScrollMode2D && pp == Player + myconnectindex && !Prediction)
-        MoveScrollMode2D(Player + myconnectindex);
-
-    // !JIM! Added M_Active() so that you don't move at all while using menus
-    if (M_Active() || ScrollMode2D || InputMode)
-        return;
-
-    SET_LOC_KEY(loc->bits, SK_SPACE_BAR, buttonMap.ButtonDown(gamefunc_Open));
-
-    int const running = G_CheckAutorun(buttonMap.ButtonDown(gamefunc_Run));
-    int32_t turnamount;
-    int32_t keymove;
-
-    // The function DoPlayerTurn() scales the player's q16angvel by 1.40625, so store as constant
-    // and use to scale back player's aim and ang values for a consistent feel between games.
-    float const angvelScale = 1.40625f;
-    float const aimvelScale = 1.203125f;
-
-    // Shadow Warrior has a ticrate of 40, 25% more than the other games, so store below constant
-    // for dividing controller input to match speed input speed of other games.
-    float const ticrateScale = 0.75f;
-
-    if (running)
-    {
-        if (pp->sop_control)
-            turnamount = RUNTURN * 3;
-        else
-            turnamount = RUNTURN;
-
-        keymove = NORMALKEYMOVE << 1;
-    }
-    else
-    {
-        if (pp->sop_control)
-            turnamount = NORMALTURN * 3;
-        else
-            turnamount = NORMALTURN;
-
-        keymove = NORMALKEYMOVE;
-    }
-
-    if (tied)
-        keymove = 0;
-
-    int32_t svel = 0, vel = 0;
-    fix16_t q16aimvel = 0, q16angvel = 0;
-
-    if (buttonMap.ButtonDown(gamefunc_Strafe) && !pp->sop)
-    {
-        svel -= (info.mousex * ticrateScale) * 4.f;
-        svel -= info.dyaw * keymove;
-    }
-    else
-    {
-        q16angvel = fix16_sadd(q16angvel, fix16_from_float(info.mousex / angvelScale));
-        q16angvel = fix16_sadd(q16angvel, fix16_from_dbl(scaleAdjustmentToInterval((info.dyaw * ticrateScale) / angvelScale)));
-    }
-
-    if (mouseaim)
-        q16aimvel = fix16_ssub(q16aimvel, fix16_from_float(info.mousey / aimvelScale));
-    else
-        vel -= (info.mousey * ticrateScale) * 8.f;
-
-    if (in_mouseflip)
-        q16aimvel = -q16aimvel;
-
-    q16aimvel -= fix16_from_dbl(scaleAdjustmentToInterval((info.dpitch * ticrateScale) / aimvelScale));
-    svel -= info.dx * keymove;
-    vel -= info.dz * keymove;
-
-    if (buttonMap.ButtonDown(gamefunc_Strafe) && !pp->sop)
-    {
-        if (buttonMap.ButtonDown(gamefunc_Turn_Left))
-            svel -= -keymove;
-        if (buttonMap.ButtonDown(gamefunc_Turn_Right))
-            svel -= keymove;
-    }
-    else
-    {
-        if (buttonMap.ButtonDown(gamefunc_Turn_Left) || (buttonMap.ButtonDown(gamefunc_Strafe_Left) && pp->sop))
-        {
-            turnheldtime += synctics;
-            if (PedanticMode)
-            {
-                if (turnheldtime >= TURBOTURNTIME)
-                    q16angvel -= fix16_from_int(turnamount);
-                else
-                    q16angvel -= fix16_from_int(PREAMBLETURN);
-            }
-            else
-                q16angvel = fix16_ssub(q16angvel, fix16_from_float(scaleAdjustmentToInterval((turnheldtime >= TURBOTURNTIME) ? turnamount : PREAMBLETURN)));
-        }
-        else if (buttonMap.ButtonDown(gamefunc_Turn_Right) || (buttonMap.ButtonDown(gamefunc_Strafe_Right) && pp->sop))
-        {
-            turnheldtime += synctics;
-            if (PedanticMode)
-            {
-                if (turnheldtime >= TURBOTURNTIME)
-                    q16angvel += fix16_from_int(turnamount);
-                else
-                    q16angvel += fix16_from_int(PREAMBLETURN);
-            }
-            else
-                q16angvel = fix16_sadd(q16angvel, fix16_from_float(scaleAdjustmentToInterval((turnheldtime >= TURBOTURNTIME) ? turnamount : PREAMBLETURN)));
-        }
-        else
-        {
-            turnheldtime = 0;
-        }
-    }
-
-    if (buttonMap.ButtonDown(gamefunc_Strafe_Left) && !pp->sop)
-        svel += keymove;
-
-    if (buttonMap.ButtonDown(gamefunc_Strafe_Right) && !pp->sop)
-        svel += -keymove;
-
-    if (buttonMap.ButtonDown(gamefunc_Move_Forward))
-    {
-        vel += keymove;
-    }
-
-    if (buttonMap.ButtonDown(gamefunc_Move_Backward))
-        vel += -keymove;
-
-    q16angvel = fix16_clamp(q16angvel, -fix16_from_int(MAXANGVEL), fix16_from_int(MAXANGVEL));
-    q16aimvel = fix16_clamp(q16aimvel, -fix16_from_int(MAXHORIZVEL), fix16_from_int(MAXHORIZVEL));
-
-    void DoPlayerTeleportPause(PLAYERp pp);
-    if (PedanticMode)
-    {
-        q16angvel = fix16_floor(q16angvel);
-        q16aimvel = fix16_floor(q16aimvel);
-    }
-    else
-    {
-        fix16_t prevcamq16ang = pp->camq16ang, prevcamq16horiz = pp->camq16horiz;
-
-        if (TEST(pp->Flags2, PF2_INPUT_CAN_TURN))
-            DoPlayerTurn(pp, &pp->camq16ang, q16angvel);
-        if (TEST(pp->Flags2, PF2_INPUT_CAN_AIM))
-            DoPlayerHorizon(pp, &pp->camq16horiz, q16aimvel);
-        pp->oq16ang += pp->camq16ang - prevcamq16ang;
-        pp->oq16horiz += pp->camq16horiz - prevcamq16horiz;
-    }
-
-    loc->vel += vel;
-    loc->svel += svel;
-
-    if (!tied)
-    {
-        vel = clamp(loc->vel, -MAXVEL, MAXVEL);
-        svel = clamp(loc->svel, -MAXSVEL, MAXSVEL);
-
-        momx = mulscale9(vel, sintable[NORM_ANGLE(fix16_to_int(newpp->q16ang) + 512)]);
-        momy = mulscale9(vel, sintable[NORM_ANGLE(fix16_to_int(newpp->q16ang))]);
-
-        momx += mulscale9(svel, sintable[NORM_ANGLE(fix16_to_int(newpp->q16ang))]);
-        momy += mulscale9(svel, sintable[NORM_ANGLE(fix16_to_int(newpp->q16ang) + 1536)]);
-
-        loc->vel = momx;
-        loc->svel = momy;
-    }
-
-    loc->q16angvel += q16angvel;
-    loc->q16aimvel += q16aimvel;
-
-    if (!CommEnabled)
-    {
-		// What a mess...:?
-#if 0
-        if (MenuButtonAutoAim)
-        {
-            MenuButtonAutoAim = FALSE;
-            if ((!!TEST(pp->Flags, PF_AUTO_AIM)) != !!cl_autoaim)
-                SET_LOC_KEY(loc->bits, SK_AUTO_AIM, TRUE);
-        }
-#endif
-    }
-    else if (inputState.GetKeyStatus(sc_Pause))
-    {
-        SET_LOC_KEY(loc->bits, SK_PAUSE, true);
-		inputState.ClearKeyStatus(sc_Pause);
-	}
-
-    SET_LOC_KEY(loc->bits, SK_CENTER_VIEW, buttonMap.ButtonDown(gamefunc_Center_View));
-
-    SET_LOC_KEY(loc->bits, SK_RUN, buttonMap.ButtonDown(gamefunc_Run));
-    SET_LOC_KEY(loc->bits, SK_SHOOT, buttonMap.ButtonDown(gamefunc_Fire));
-
-    // actually snap
-    SET_LOC_KEY(loc->bits, SK_SNAP_UP, buttonMap.ButtonDown(gamefunc_Aim_Up));
-    SET_LOC_KEY(loc->bits, SK_SNAP_DOWN, buttonMap.ButtonDown(gamefunc_Aim_Down));
-
-    // actually just look
-    SET_LOC_KEY(loc->bits, SK_LOOK_UP, buttonMap.ButtonDown(gamefunc_Look_Up));
-    SET_LOC_KEY(loc->bits, SK_LOOK_DOWN, buttonMap.ButtonDown(gamefunc_Look_Down));
-
-    for (i = 0; i < MAX_WEAPONS_KEYS; i++)
-    {
-        if (buttonMap.ButtonDown(gamefunc_Weapon_1 + i))
-        {
-            SET(loc->bits, i + 1);
-            break;
-        }
-    }
-
-    if (buttonMap.ButtonPressed(gamefunc_Next_Weapon))
-    {
-        USERp u = User[pp->PlayerSprite];
-        short next_weapon = u->WeaponNum + 1;
-        short start_weapon;
-
-        buttonMap.ClearButton(gamefunc_Next_Weapon);
-
-        start_weapon = u->WeaponNum + 1;
-
-        if (u->WeaponNum == WPN_SWORD)
-            start_weapon = WPN_STAR;
-
-        if (u->WeaponNum == WPN_FIST)
-        {
-            next_weapon = 14;
-        }
-        else
-        {
-            next_weapon = -1;
-            for (i = start_weapon; TRUE; i++)
-            {
-                if (i >= MAX_WEAPONS_KEYS)
-                {
-                    next_weapon = 13;
-                    break;
-                }
-
-                if (TEST(pp->WpnFlags, BIT(i)) && pp->WpnAmmo[i])
-                {
-                    next_weapon = i;
-                    break;
-                }
-            }
-        }
-
-        SET(loc->bits, next_weapon + 1);
-    }
-
-
-    if (buttonMap.ButtonPressed(gamefunc_Previous_Weapon))
-    {
-        USERp u = User[pp->PlayerSprite];
-        short prev_weapon = u->WeaponNum - 1;
-        short start_weapon;
-
-        buttonMap.ClearButton(gamefunc_Previous_Weapon);
-
-        start_weapon = u->WeaponNum - 1;
-
-        if (u->WeaponNum == WPN_SWORD)
-        {
-            prev_weapon = 13;
-        }
-        else if (u->WeaponNum == WPN_STAR)
-        {
-            prev_weapon = 14;
-        }
-        else
-        {
-            prev_weapon = -1;
-            for (i = start_weapon; TRUE; i--)
-            {
-                if (i <= -1)
-                    i = WPN_HEART;
-
-                if (TEST(pp->WpnFlags, BIT(i)) && pp->WpnAmmo[i])
-                {
-                    prev_weapon = i;
-                    break;
-                }
-            }
-        }
-
-        SET(loc->bits, prev_weapon + 1);
-    }
-
-    if (buttonMap.ButtonDown(gamefunc_Alt_Weapon))
-    {
-        buttonMap.ClearButton(gamefunc_Alt_Weapon);
-        USERp u = User[pp->PlayerSprite];
-        short const which_weapon = u->WeaponNum + 1;
-        SET(loc->bits, which_weapon);
-    }
-
-
-    inv_hotkey = 0;
-    if (buttonMap.ButtonDown(gamefunc_MedKit))
-        inv_hotkey = INVENTORY_MEDKIT+1;
-    if (buttonMap.ButtonDown(gamefunc_Smoke_Bomb))
-        inv_hotkey = INVENTORY_CLOAK+1;
-    if (buttonMap.ButtonDown(gamefunc_NightVision))
-        inv_hotkey = INVENTORY_NIGHT_VISION+1;
-    if (buttonMap.ButtonDown(gamefunc_Gas_Bomb))
-        inv_hotkey = INVENTORY_CHEMBOMB+1;
-    if (buttonMap.ButtonDown(gamefunc_Flash_Bomb) && dimensionmode == 3)
-        inv_hotkey = INVENTORY_FLASHBOMB+1;
-    if (buttonMap.ButtonDown(gamefunc_Caltrops))
-        inv_hotkey = INVENTORY_CALTROPS+1;
-
-    SET(loc->bits, inv_hotkey<<SK_INV_HOTKEY_BIT0);
-
-    SET_LOC_KEY(loc->bits, SK_INV_USE, buttonMap.ButtonDown(gamefunc_Inventory));
-
-    SET_LOC_KEY(loc->bits, SK_OPERATE, buttonMap.ButtonDown(gamefunc_Open));
-    SET_LOC_KEY(loc->bits, SK_JUMP, buttonMap.ButtonDown(gamefunc_Jump));
-    SET_LOC_KEY(loc->bits, SK_CRAWL, buttonMap.ButtonDown(gamefunc_Crouch));
-
-    SET_LOC_KEY(loc->bits, SK_TURN_180, buttonMap.ButtonDown(gamefunc_TurnAround));
-
-    SET_LOC_KEY(loc->bits, SK_INV_LEFT, buttonMap.ButtonDown(gamefunc_Inventory_Left));
-    SET_LOC_KEY(loc->bits, SK_INV_RIGHT, buttonMap.ButtonDown(gamefunc_Inventory_Right));
-
-    SET_LOC_KEY(loc->bits, SK_HIDE_WEAPON, buttonMap.ButtonDown(gamefunc_Holster_Weapon));
-
-    // need BUTTON
-    SET_LOC_KEY(loc->bits, SK_CRAWL_LOCK, buttonMap.ButtonDown(gamefunc_Toggle_Crouch));
-
-    if (gNet.MultiGameType == MULTI_GAME_COOPERATIVE)
-    {
-        if (buttonMap.ButtonDown(gamefunc_See_Coop_View))
-        {
-            buttonMap.ClearButton(gamefunc_See_Coop_View);
-
-            screenpeek = connectpoint2[screenpeek];
-
-            if (screenpeek < 0)
-                screenpeek = connecthead;
-
-            if (dimensionmode != 2 && screenpeek == myconnectindex)
-            {
-                // JBF: figure out what's going on here
-                DoPlayerDivePalette(pp);  // Check Dive again
-                DoPlayerNightVisionPalette(pp);  // Check Night Vision again
-            }
-            else
-            {
-                PLAYERp tp = Player+screenpeek;
-                DoPlayerDivePalette(tp);
-                DoPlayerNightVisionPalette(tp);
-            }
-        }
-    }
-
-    if (!tied)
-        FunctionKeys(pp);
-
-    if (buttonMap.ButtonDown(gamefunc_Toggle_Crosshair))
-    {
-        buttonMap.ClearButton(gamefunc_Toggle_Crosshair);
-        pToggleCrosshair();
-    }
-}
-
 #define MAP_WHITE_SECTOR    (LT_GREY + 2)
 #define MAP_RED_SECTOR      (RED + 6)
 #define MAP_FLOOR_SPRITE    (RED + 8)
diff --git a/source/sw/src/game.h b/source/sw/src/game.h
index 20e4dae26..8b216bf66 100644
--- a/source/sw/src/game.h
+++ b/source/sw/src/game.h
@@ -76,45 +76,20 @@ enum GameFunction_t
     gamefunc_Strafe_Right,
     gamefunc_Aim_Up,
     gamefunc_Aim_Down,
-    gamefunc_Weapon_1,
-    gamefunc_Weapon_2,
-    gamefunc_Weapon_3,
-    gamefunc_Weapon_4,
-    gamefunc_Weapon_5,
-    gamefunc_Weapon_6,
-    gamefunc_Weapon_7,
-    gamefunc_Weapon_8,
-    gamefunc_Weapon_9,
-    gamefunc_Weapon_10,
-    gamefunc_Inventory,
-    gamefunc_Inventory_Left,
-    gamefunc_Inventory_Right,
-    gamefunc_NightVision,
-    gamefunc_MedKit,
-    gamefunc_TurnAround,
     gamefunc_SendMessage,
     gamefunc_Map,
     gamefunc_Shrink_Screen,
     gamefunc_Enlarge_Screen,
-    gamefunc_Center_View,
-    gamefunc_Holster_Weapon,
     gamefunc_Show_Opponents_Weapon,
     gamefunc_Map_Follow_Mode,
     gamefunc_See_Coop_View,
     gamefunc_Mouse_Aiming,
-    gamefunc_Toggle_Crosshair,
-    gamefunc_Next_Weapon,
-    gamefunc_Previous_Weapon,
     gamefunc_Dpad_Select,
     gamefunc_Dpad_Aiming,
     gamefunc_Last_Weapon,
     gamefunc_Alt_Weapon,
     gamefunc_Third_Person_View,
     gamefunc_Toggle_Crouch,	// This is the last one used by EDuke32.
-    gamefunc_Smoke_Bomb,			// and these by ShadowWarrior (todo: There's quite a bit of potential for consolidation here - is it worth it?)
-    gamefunc_Gas_Bomb,
-    gamefunc_Flash_Bomb,
-    gamefunc_Caltrops,
     NUM_ACTIONS
 };
 
@@ -892,6 +867,10 @@ extern FString ThemeSongs[6];                                          //
 #define MAX_EPISODE_NAME_LEN 24
 extern char EpisodeNames[3][MAX_EPISODE_NAME_LEN+2];
 
+extern int Follow_posx, Follow_posy;
+extern SWBOOL ScrollMode2D;
+
+
 
 
 
@@ -2340,6 +2319,7 @@ void LoadSaveMsg(const char *msg);
 
 void UpdateStatusBar(ClockTicks arg);
 void InitFonts();
+void registerinputcommands();
 
 extern int PlayClock;
 extern short LevelSecrets;
@@ -2370,6 +2350,7 @@ struct GameInterface : ::GameInterface
     void SetAmbience(bool on) override { if (on) StartAmbientSound(); else StopAmbientSound(); }
     FString GetCoordString() override;
     ReservedSpace GetReservedScreenSpace(int viewsize) override;
+    void clearlocalinputstate() override;
 
     FString statFPS() override;
     GameStats getStats() override;
diff --git a/source/sw/src/input.cpp b/source/sw/src/input.cpp
new file mode 100644
index 000000000..eb5c29f30
--- /dev/null
+++ b/source/sw/src/input.cpp
@@ -0,0 +1,595 @@
+//-------------------------------------------------------------------------
+/*
+Copyright (C) 1997, 2005 - 3D Realms Entertainment
+
+This file is part of Shadow Warrior version 1.2
+
+Shadow Warrior is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+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.
+
+Original Source: 1997 - Frank Maddin and Jim Norwood
+Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
+*/
+//-------------------------------------------------------------------------
+
+#include "ns.h"
+#include "game.h"
+#include "network.h"
+#include "gamecontrol.h"
+#include "player.h"
+#include "menu.h"
+
+
+BEGIN_SW_NS
+
+SWBOOL MultiPlayQuitFlag = FALSE;
+
+int WeaponToSend = 0;
+int BitsToSend = 0;
+int inv_hotkey = 0;
+
+
+void
+FunctionKeys(PLAYERp pp)
+{
+    static int rts_delay = 0;
+    int fn_key = 0;
+
+    rts_delay++;
+
+    if (inputState.GetKeyStatus(sc_F1))   { fn_key = 1; }
+    if (inputState.GetKeyStatus(sc_F2))   { fn_key = 2; }
+    if (inputState.GetKeyStatus(sc_F3))   { fn_key = 3; }
+    if (inputState.GetKeyStatus(sc_F4))   { fn_key = 4; }
+    if (inputState.GetKeyStatus(sc_F5))   { fn_key = 5; }
+    if (inputState.GetKeyStatus(sc_F6))   { fn_key = 6; }
+    if (inputState.GetKeyStatus(sc_F7))   { fn_key = 7; }
+    if (inputState.GetKeyStatus(sc_F8))   { fn_key = 8; }
+    if (inputState.GetKeyStatus(sc_F9))   { fn_key = 9; }
+    if (inputState.GetKeyStatus(sc_F10))  { fn_key = 10; }
+
+    if (inputState.AltPressed())
+    {
+        if (rts_delay > 16 && fn_key && !adult_lockout)
+        {
+			inputState.ClearKeyStatus(sc_F1 + fn_key - 1);
+            rts_delay = 0;
+            PlaySoundRTS(fn_key);
+        }
+
+        return;
+    }
+
+    if (inputState.ShiftPressed())
+    {
+        if (fn_key)
+        {
+			inputState.ClearKeyStatus(sc_F1 + fn_key - 1);
+        }
+
+        return;
+    }
+
+    // F7 VIEW control
+	if (buttonMap.ButtonDown(gamefunc_Third_Person_View))
+    {
+		buttonMap.ClearButton(gamefunc_Third_Person_View);
+
+        if (SHIFTS_IS_PRESSED)
+        {
+            if (TEST(pp->Flags, PF_VIEW_FROM_OUTSIDE))
+                pp->view_outside_dang = NORM_ANGLE(pp->view_outside_dang + 256);
+        }
+        else
+        {
+            if (TEST(pp->Flags, PF_VIEW_FROM_OUTSIDE))
+            {
+                RESET(pp->Flags, PF_VIEW_FROM_OUTSIDE);
+            }
+            else
+            {
+                SET(pp->Flags, PF_VIEW_FROM_OUTSIDE);
+                pp->camera_dist = 0;
+            }
+        }
+    }
+}
+
+
+
+double elapsedInputTicks;
+double scaleAdjustmentToInterval(double x) { return x * (120 / synctics) / (1000.0 / elapsedInputTicks); }
+
+void DoPlayerTurn(PLAYERp pp, fix16_t *pq16ang, fix16_t q16angvel);
+void DoPlayerHorizon(PLAYERp pp, fix16_t *pq16horiz, fix16_t q16aimvel);
+
+
+void
+getinput(SW_PACKET *loc, SWBOOL tied)
+{
+    int i;
+    PLAYERp pp = Player + myconnectindex;
+    PLAYERp newpp = Player + myconnectindex;
+
+#define TURBOTURNTIME (120/8)
+#define NORMALTURN   (12+6)
+#define RUNTURN      (28)
+#define PREAMBLETURN 3
+#define NORMALKEYMOVE 35
+#define MAXVEL       ((NORMALKEYMOVE*2)+10)
+#define MAXSVEL      ((NORMALKEYMOVE*2)+10)
+#define MAXANGVEL    100
+#define MAXHORIZVEL  128
+#define SET_LOC_KEY(loc, sync_num, key_test) SET(loc, ((!!(key_test)) << (sync_num)))
+
+    static int32_t turnheldtime;
+    int32_t momx, momy;
+
+    extern SWBOOL MenuButtonAutoAim;
+
+    if (Prediction && CommEnabled)
+    {
+        newpp = ppp;
+    }
+
+    static double lastInputTicks;
+
+    auto const currentHiTicks = timerGetHiTicks();
+    elapsedInputTicks = currentHiTicks - lastInputTicks;
+
+    lastInputTicks = currentHiTicks;
+
+    // MAKE SURE THIS WILL GET SET
+    SET_LOC_KEY(loc->bits, SK_QUIT_GAME, MultiPlayQuitFlag);
+
+    bool mouseaim = in_mousemode || buttonMap.ButtonDown(gamefunc_Mouse_Aiming);
+
+    if (!CommEnabled)
+    {
+        // Go back to the source to set this - the old code here was catastrophically bad.
+        // this needs to be fixed properly - as it is this can never be compatible with demo playback.
+
+        if (mouseaim)
+            SET(Player[myconnectindex].Flags, PF_MOUSE_AIMING_ON);
+        else
+            RESET(Player[myconnectindex].Flags, PF_MOUSE_AIMING_ON);
+
+        if (cl_autoaim)
+            SET(Player[myconnectindex].Flags, PF_AUTO_AIM);
+        else
+            RESET(Player[myconnectindex].Flags, PF_AUTO_AIM);
+    }
+
+    ControlInfo info;
+    CONTROL_GetInput(&info);
+
+    if (paused)
+        return;
+
+    // MAP KEY
+    if (buttonMap.ButtonDown(gamefunc_Map))
+    {
+        buttonMap.ClearButton(gamefunc_Map);
+
+        // Init follow coords
+        Follow_posx = pp->posx;
+        Follow_posy = pp->posy;
+
+        if (dimensionmode == 3)
+            dimensionmode = 5;
+        else if (dimensionmode == 5)
+            dimensionmode = 6;
+        else
+        {
+            dimensionmode = 3;
+            ScrollMode2D = FALSE;
+        }
+    }
+
+    // Toggle follow map mode on/off
+    if (dimensionmode == 5 || dimensionmode == 6)
+    {
+        if (buttonMap.ButtonDown(gamefunc_Map_Follow_Mode))
+        {
+			buttonMap.ClearButton(gamefunc_Map_Follow_Mode);
+            ScrollMode2D = !ScrollMode2D;
+            Follow_posx = pp->posx;
+            Follow_posy = pp->posy;
+        }
+    }
+
+    // If in 2D follow mode, scroll around using glob vars
+    // Tried calling this in domovethings, but key response it too poor, skips key presses
+    // Note: ScrollMode2D = Follow mode, so this get called only during follow mode
+    if (!tied && ScrollMode2D && pp == Player + myconnectindex && !Prediction)
+        MoveScrollMode2D(Player + myconnectindex);
+
+    // !JIM! Added M_Active() so that you don't move at all while using menus
+    if (M_Active() || ScrollMode2D || InputMode)
+        return;
+
+    SET_LOC_KEY(loc->bits, SK_SPACE_BAR, buttonMap.ButtonDown(gamefunc_Open));
+
+    int const running = G_CheckAutorun(buttonMap.ButtonDown(gamefunc_Run));
+    int32_t turnamount;
+    int32_t keymove;
+
+    // The function DoPlayerTurn() scales the player's q16angvel by 1.40625, so store as constant
+    // and use to scale back player's aim and ang values for a consistent feel between games.
+    float const angvelScale = 1.40625f;
+    float const aimvelScale = 1.203125f;
+
+    // Shadow Warrior has a ticrate of 40, 25% more than the other games, so store below constant
+    // for dividing controller input to match speed input speed of other games.
+    float const ticrateScale = 0.75f;
+
+    if (running)
+    {
+        if (pp->sop_control)
+            turnamount = RUNTURN * 3;
+        else
+            turnamount = RUNTURN;
+
+        keymove = NORMALKEYMOVE << 1;
+    }
+    else
+    {
+        if (pp->sop_control)
+            turnamount = NORMALTURN * 3;
+        else
+            turnamount = NORMALTURN;
+
+        keymove = NORMALKEYMOVE;
+    }
+
+    if (tied)
+        keymove = 0;
+
+    int32_t svel = 0, vel = 0;
+    fix16_t q16aimvel = 0, q16angvel = 0;
+
+    if (buttonMap.ButtonDown(gamefunc_Strafe) && !pp->sop)
+    {
+        svel -= (info.mousex * ticrateScale) * 4.f;
+        svel -= info.dyaw * keymove;
+    }
+    else
+    {
+        q16angvel = fix16_sadd(q16angvel, fix16_from_float(info.mousex / angvelScale));
+        q16angvel = fix16_sadd(q16angvel, fix16_from_dbl(scaleAdjustmentToInterval((info.dyaw * ticrateScale) / angvelScale)));
+    }
+
+    if (mouseaim)
+        q16aimvel = fix16_ssub(q16aimvel, fix16_from_float(info.mousey / aimvelScale));
+    else
+        vel -= (info.mousey * ticrateScale) * 8.f;
+
+    if (in_mouseflip)
+        q16aimvel = -q16aimvel;
+
+    q16aimvel -= fix16_from_dbl(scaleAdjustmentToInterval((info.dpitch * ticrateScale) / aimvelScale));
+    svel -= info.dx * keymove;
+    vel -= info.dz * keymove;
+
+    if (buttonMap.ButtonDown(gamefunc_Strafe) && !pp->sop)
+    {
+        if (buttonMap.ButtonDown(gamefunc_Turn_Left))
+            svel -= -keymove;
+        if (buttonMap.ButtonDown(gamefunc_Turn_Right))
+            svel -= keymove;
+    }
+    else
+    {
+        if (buttonMap.ButtonDown(gamefunc_Turn_Left) || (buttonMap.ButtonDown(gamefunc_Strafe_Left) && pp->sop))
+        {
+            turnheldtime += synctics;
+            if (PedanticMode)
+            {
+                if (turnheldtime >= TURBOTURNTIME)
+                    q16angvel -= fix16_from_int(turnamount);
+                else
+                    q16angvel -= fix16_from_int(PREAMBLETURN);
+            }
+            else
+                q16angvel = fix16_ssub(q16angvel, fix16_from_float(scaleAdjustmentToInterval((turnheldtime >= TURBOTURNTIME) ? turnamount : PREAMBLETURN)));
+        }
+        else if (buttonMap.ButtonDown(gamefunc_Turn_Right) || (buttonMap.ButtonDown(gamefunc_Strafe_Right) && pp->sop))
+        {
+            turnheldtime += synctics;
+            if (PedanticMode)
+            {
+                if (turnheldtime >= TURBOTURNTIME)
+                    q16angvel += fix16_from_int(turnamount);
+                else
+                    q16angvel += fix16_from_int(PREAMBLETURN);
+            }
+            else
+                q16angvel = fix16_sadd(q16angvel, fix16_from_float(scaleAdjustmentToInterval((turnheldtime >= TURBOTURNTIME) ? turnamount : PREAMBLETURN)));
+        }
+        else
+        {
+            turnheldtime = 0;
+        }
+    }
+
+    if (buttonMap.ButtonDown(gamefunc_Strafe_Left) && !pp->sop)
+        svel += keymove;
+
+    if (buttonMap.ButtonDown(gamefunc_Strafe_Right) && !pp->sop)
+        svel += -keymove;
+
+    if (buttonMap.ButtonDown(gamefunc_Move_Forward))
+    {
+        vel += keymove;
+    }
+
+    if (buttonMap.ButtonDown(gamefunc_Move_Backward))
+        vel += -keymove;
+
+    q16angvel = fix16_clamp(q16angvel, -fix16_from_int(MAXANGVEL), fix16_from_int(MAXANGVEL));
+    q16aimvel = fix16_clamp(q16aimvel, -fix16_from_int(MAXHORIZVEL), fix16_from_int(MAXHORIZVEL));
+
+    void DoPlayerTeleportPause(PLAYERp pp);
+    if (PedanticMode)
+    {
+        q16angvel = fix16_floor(q16angvel);
+        q16aimvel = fix16_floor(q16aimvel);
+    }
+    else
+    {
+        fix16_t prevcamq16ang = pp->camq16ang, prevcamq16horiz = pp->camq16horiz;
+
+        if (TEST(pp->Flags2, PF2_INPUT_CAN_TURN))
+            DoPlayerTurn(pp, &pp->camq16ang, q16angvel);
+        if (TEST(pp->Flags2, PF2_INPUT_CAN_AIM))
+            DoPlayerHorizon(pp, &pp->camq16horiz, q16aimvel);
+        pp->oq16ang += pp->camq16ang - prevcamq16ang;
+        pp->oq16horiz += pp->camq16horiz - prevcamq16horiz;
+    }
+
+    loc->vel += vel;
+    loc->svel += svel;
+
+    if (!tied)
+    {
+        vel = clamp(loc->vel, -MAXVEL, MAXVEL);
+        svel = clamp(loc->svel, -MAXSVEL, MAXSVEL);
+
+        momx = mulscale9(vel, sintable[NORM_ANGLE(fix16_to_int(newpp->q16ang) + 512)]);
+        momy = mulscale9(vel, sintable[NORM_ANGLE(fix16_to_int(newpp->q16ang))]);
+
+        momx += mulscale9(svel, sintable[NORM_ANGLE(fix16_to_int(newpp->q16ang))]);
+        momy += mulscale9(svel, sintable[NORM_ANGLE(fix16_to_int(newpp->q16ang) + 1536)]);
+
+        loc->vel = momx;
+        loc->svel = momy;
+    }
+
+    loc->q16angvel += q16angvel;
+    loc->q16aimvel += q16aimvel;
+
+    if (!CommEnabled)
+    {
+		// What a mess...:?
+#if 0
+        if (MenuButtonAutoAim)
+        {
+            MenuButtonAutoAim = FALSE;
+            if ((!!TEST(pp->Flags, PF_AUTO_AIM)) != !!cl_autoaim)
+                SET_LOC_KEY(loc->bits, SK_AUTO_AIM, TRUE);
+        }
+#endif
+    }
+    else if (inputState.GetKeyStatus(sc_Pause))
+    {
+        SET_LOC_KEY(loc->bits, SK_PAUSE, true);
+		inputState.ClearKeyStatus(sc_Pause);
+	}
+
+    SET_LOC_KEY(loc->bits, SK_RUN, buttonMap.ButtonDown(gamefunc_Run));
+    SET_LOC_KEY(loc->bits, SK_SHOOT, buttonMap.ButtonDown(gamefunc_Fire));
+
+    // actually snap
+    SET_LOC_KEY(loc->bits, SK_SNAP_UP, buttonMap.ButtonDown(gamefunc_Aim_Up));
+    SET_LOC_KEY(loc->bits, SK_SNAP_DOWN, buttonMap.ButtonDown(gamefunc_Aim_Down));
+
+    // actually just look
+    SET_LOC_KEY(loc->bits, SK_LOOK_UP, buttonMap.ButtonDown(gamefunc_Look_Up));
+    SET_LOC_KEY(loc->bits, SK_LOOK_DOWN, buttonMap.ButtonDown(gamefunc_Look_Down));
+
+    if (WeaponToSend > 0)
+    {
+        loc->bits &= ~SK_WEAPON_MASK;
+        loc->bits |= WeaponToSend;
+        WeaponToSend = 0;
+    }
+    else if (WeaponToSend == -1)
+    {
+        USERp u = User[pp->PlayerSprite];
+        short next_weapon = u->WeaponNum + 1;
+        short start_weapon;
+
+        WeaponToSend = 0;
+        start_weapon = u->WeaponNum + 1;
+
+        if (u->WeaponNum == WPN_SWORD)
+            start_weapon = WPN_STAR;
+
+        if (u->WeaponNum == WPN_FIST)
+        {
+            next_weapon = 14;
+        }
+        else
+        {
+            next_weapon = -1;
+            for (i = start_weapon; TRUE; i++)
+            {
+                if (i >= MAX_WEAPONS_KEYS)
+                {
+                    next_weapon = 13;
+                    break;
+                }
+
+                if (TEST(pp->WpnFlags, BIT(i)) && pp->WpnAmmo[i])
+                {
+                    next_weapon = i;
+                    break;
+                }
+            }
+        }
+
+        SET(loc->bits, next_weapon + 1);
+    }
+    else if (WeaponToSend == -2)
+    {
+        USERp u = User[pp->PlayerSprite];
+        short prev_weapon = u->WeaponNum - 1;
+        short start_weapon;
+
+        WeaponToSend = 0;
+
+        start_weapon = u->WeaponNum - 1;
+
+        if (u->WeaponNum == WPN_SWORD)
+        {
+            prev_weapon = 13;
+        }
+        else if (u->WeaponNum == WPN_STAR)
+        {
+            prev_weapon = 14;
+        }
+        else
+        {
+            prev_weapon = -1;
+            for (i = start_weapon; TRUE; i--)
+            {
+                if (i <= -1)
+                    i = WPN_HEART;
+
+                if (TEST(pp->WpnFlags, BIT(i)) && pp->WpnAmmo[i])
+                {
+                    prev_weapon = i;
+                    break;
+                }
+            }
+        }
+
+        SET(loc->bits, prev_weapon + 1);
+    }
+
+    if (buttonMap.ButtonDown(gamefunc_Alt_Weapon))
+    {
+        buttonMap.ClearButton(gamefunc_Alt_Weapon);
+        USERp u = User[pp->PlayerSprite];
+        short const which_weapon = u->WeaponNum + 1;
+        SET(loc->bits, which_weapon);
+    }
+
+
+    loc->bits |= BitsToSend;
+    BitsToSend = 0;
+
+    SET(loc->bits, inv_hotkey<<SK_INV_HOTKEY_BIT0);
+    inv_hotkey = 0;
+
+    SET_LOC_KEY(loc->bits, SK_OPERATE, buttonMap.ButtonDown(gamefunc_Open));
+    SET_LOC_KEY(loc->bits, SK_JUMP, buttonMap.ButtonDown(gamefunc_Jump));
+    SET_LOC_KEY(loc->bits, SK_CRAWL, buttonMap.ButtonDown(gamefunc_Crouch));
+
+    // need BUTTON
+    SET_LOC_KEY(loc->bits, SK_CRAWL_LOCK, buttonMap.ButtonDown(gamefunc_Toggle_Crouch));
+
+    if (gNet.MultiGameType == MULTI_GAME_COOPERATIVE)
+    {
+        if (buttonMap.ButtonDown(gamefunc_See_Coop_View))
+        {
+            buttonMap.ClearButton(gamefunc_See_Coop_View);
+
+            screenpeek = connectpoint2[screenpeek];
+
+            if (screenpeek < 0)
+                screenpeek = connecthead;
+
+            if (dimensionmode != 2 && screenpeek == myconnectindex)
+            {
+                // JBF: figure out what's going on here
+                DoPlayerDivePalette(pp);  // Check Dive again
+                DoPlayerNightVisionPalette(pp);  // Check Night Vision again
+            }
+            else
+            {
+                PLAYERp tp = Player+screenpeek;
+                DoPlayerDivePalette(tp);
+                DoPlayerNightVisionPalette(tp);
+            }
+        }
+    }
+
+    if (!tied)
+        FunctionKeys(pp);
+}
+
+
+//---------------------------------------------------------------------------
+//
+// CCMD based input. The basics are from Randi's ZDuke but this uses dynamic
+// registration to only have the commands active when this game module runs.
+//
+//---------------------------------------------------------------------------
+
+static int ccmd_slot(CCmdFuncPtr parm)
+{
+    if (parm->numparms != 1) return CCMD_SHOWHELP;
+
+    auto slot = atoi(parm->parms[0]);
+    if (slot >= 1 && slot <= 10)
+    {
+        WeaponToSend = slot;
+        return CCMD_OK;
+    }
+    return CCMD_SHOWHELP;
+}
+
+
+void registerinputcommands()
+{
+    C_RegisterFunction("slot", "slot <weaponslot>: select a weapon from the given slot (1-10)", ccmd_slot);
+    C_RegisterFunction("weapprev", nullptr, [](CCmdFuncPtr)->int { WeaponToSend = -2; return CCMD_OK; });
+    C_RegisterFunction("weapnext", nullptr, [](CCmdFuncPtr)->int { WeaponToSend = -1; return CCMD_OK; });
+    C_RegisterFunction("pause", nullptr, [](CCmdFuncPtr)->int { BitsToSend |= BIT(SK_PAUSE); return CCMD_OK; });
+    C_RegisterFunction("smoke_bomb", nullptr, [](CCmdFuncPtr)->int { inv_hotkey = INVENTORY_CLOAK + 1; return CCMD_OK; });
+    C_RegisterFunction("nightvision", nullptr, [](CCmdFuncPtr)->int { inv_hotkey = INVENTORY_NIGHT_VISION + 1; return CCMD_OK; });
+    C_RegisterFunction("medkit", nullptr, [](CCmdFuncPtr)->int { inv_hotkey = INVENTORY_MEDKIT + 1; return CCMD_OK; });
+    C_RegisterFunction("centerview", nullptr, [](CCmdFuncPtr)->int { BitsToSend |= BIT(SK_CENTER_VIEW); return CCMD_OK; });
+    C_RegisterFunction("holsterweapon", nullptr, [](CCmdFuncPtr)->int { BitsToSend |= BIT(SK_HIDE_WEAPON); return CCMD_OK; });
+    C_RegisterFunction("invprev", nullptr, [](CCmdFuncPtr)->int { BitsToSend |= BIT(SK_INV_LEFT); return CCMD_OK; });
+    C_RegisterFunction("invnext", nullptr, [](CCmdFuncPtr)->int { BitsToSend |= BIT(SK_INV_RIGHT); return CCMD_OK; });
+    C_RegisterFunction("gas_bomb", nullptr, [](CCmdFuncPtr)->int { inv_hotkey = INVENTORY_CHEMBOMB + 1; return CCMD_OK; });
+    C_RegisterFunction("flash_bomb", nullptr, [](CCmdFuncPtr)->int { if (dimensionmode == 3) inv_hotkey = INVENTORY_FLASHBOMB + 1; return CCMD_OK; });
+    C_RegisterFunction("caltrops", nullptr, [](CCmdFuncPtr)->int { inv_hotkey = INVENTORY_CALTROPS + 1; return CCMD_OK; });
+    C_RegisterFunction("turnaround", nullptr, [](CCmdFuncPtr)->int { BitsToSend |= BIT(SK_TURN_180); return CCMD_OK; });
+    C_RegisterFunction("invuse", nullptr, [](CCmdFuncPtr)->int { BitsToSend |= BIT(SK_INV_USE); return CCMD_OK; });
+}
+
+// This is called from ImputState::ClearAllInput and resets all static state being used here.
+void GameInterface::clearlocalinputstate()
+{
+    WeaponToSend = 0;
+    BitsToSend = 0;
+    inv_hotkey = 0;
+
+}
+
+END_SW_NS
diff --git a/source/sw/src/player.cpp b/source/sw/src/player.cpp
index 846f5af1f..81963a3ff 100644
--- a/source/sw/src/player.cpp
+++ b/source/sw/src/player.cpp
@@ -72,7 +72,6 @@ void pWeaponForceRest(PLAYERp pp);
 #define SO_IDLE_SOUND 1
 
 extern SWBOOL NoMeters;
-extern int Follow_posx,Follow_posy;
 
 #define TEST_UNDERWATER(pp) (TEST(sector[(pp)->cursectnum].extra, SECTFX_UNDERWATER))
 
@@ -2459,8 +2458,6 @@ MoveScrollMode2D(PLAYERp pp)
     int32_t keymove;
     int32_t momx, momy;
     static int mfvel=0, mfsvel=0;
-    extern SWBOOL ScrollMode2D;
-
 
     CONTROL_GetInput(&scrl_input);
 
@@ -2469,12 +2466,14 @@ MoveScrollMode2D(PLAYERp pp)
     if (M_Active())
         return;
 
+#if 0
     // Recenter view if told
     if (buttonMap.ButtonDown(gamefunc_Center_View))
     {
         Follow_posx = pp->posx;
         Follow_posy = pp->posy;
     }
+#endif
 
     // Toggle follow map mode on/off
     if (buttonMap.ButtonDown(gamefunc_Map_Follow_Mode))
@@ -7736,8 +7735,6 @@ domovethings(void)
         // Reset flags used while tying input to framerate
         auto prevFlags2 = pp->Flags2;
         RESET(pp->Flags2, PF2_INPUT_CAN_TURN|PF2_INPUT_CAN_AIM);
-//        extern SWBOOL ScrollMode2D;
-        //if (!ScrollMode2D)
         if (pp->DoPlayerAction) pp->DoPlayerAction(pp);
 
         // Fix a possible jitter upon player action change;
diff --git a/wadsrc/static/engine/menudef.txt b/wadsrc/static/engine/menudef.txt
index 4f7756976..0ddf06302 100644
--- a/wadsrc/static/engine/menudef.txt
+++ b/wadsrc/static/engine/menudef.txt
@@ -599,7 +599,7 @@ OptionMenu "WeaponsControlMenu"// protected
 	{
 		Control    "$CNTRLMNU_RELOAD" , "steroids"
 	}
-	ifgame(Duke, Nam, WW2GI, Fury)
+	ifgame(Duke, Nam, WW2GI)
 	{
 		Control "$CNTRLMNU_QUICKKICK"     , "+quick_kick"
 	}
@@ -615,10 +615,10 @@ OptionMenu "WeaponsControlMenu"// protected
 	}
 	ifgame(ShadowWarrior)
 	{
-		Control "$CNTRLMNU_SMOKEBOMB","+smoke_bomb"
-		Control "$CNTRLMNU_GASBOMB"   ,"+gas_bomb"
-		Control "$CNTRLMNU_FLASHBOMB","+flash_bomb"
-		Control "$CNTRLMNU_CALTROPS"   ,"+caltrops"
+		Control "$CNTRLMNU_SMOKEBOMB","smoke_bomb"
+		Control "$CNTRLMNU_GASBOMB"   ,"gas_bomb"
+		Control "$CNTRLMNU_FLASHBOMB","flash_bomb"
+		Control "$CNTRLMNU_CALTROPS"   ,"caltrops"
 	}
 
 }
@@ -682,8 +682,8 @@ OptionMenu "InventoryControlsMenu"// protected
 	ifgame(ShadowWarrior)
 	{
 		StaticText ""
-		Control    "$CNTRLMNU_NIGHTVISION" , "+nightvision"
-		Control    "$CNTRLMNU_MEDKIT" , "+medkit"
+		Control    "$CNTRLMNU_NIGHTVISION" , "nightvision"
+		Control    "$CNTRLMNU_MEDKIT" , "medkit"
 	}
 }
 
diff --git a/wadsrc/static/filter/shadowwarrior/engine/defbinds.txt b/wadsrc/static/filter/shadowwarrior/engine/defbinds.txt
index 43932258a..efbd4d234 100644
--- a/wadsrc/static/filter/shadowwarrior/engine/defbinds.txt
+++ b/wadsrc/static/filter/shadowwarrior/engine/defbinds.txt
@@ -1,9 +1,9 @@
 //
 I "+Toggle_Crosshair"
-Mouse2 "+MediKit"
-M "+MedKit"
-B "+Smoke_Bomb"
-N "+Nightvision"
-G "+Gas_Bomb"
-F "+Flash_Bomb"
-C "+Caltrops"
+Mouse2 "MedKit"
+M "MedKit"
+B "Smoke_Bomb"
+N "Nightvision"
+G "Gas_Bomb"
+F "Flash_Bomb"
+C "Caltrops"
diff --git a/wadsrc/static/filter/shadowwarrior/engine/leftbinds.txt b/wadsrc/static/filter/shadowwarrior/engine/leftbinds.txt
index 39c294001..e45842f26 100644
--- a/wadsrc/static/filter/shadowwarrior/engine/leftbinds.txt
+++ b/wadsrc/static/filter/shadowwarrior/engine/leftbinds.txt
@@ -1,6 +1,6 @@
-M "+MedKit"
-B "+Smoke_Bomb"
-N "+Nightvision"
-G "+Gas_Bomb"
-F "+Flash_Bomb"
-C "+Caltrops"
+M "MedKit"
+B "Smoke_Bomb"
+N "Nightvision"
+G "Gas_Bomb"
+F "Flash_Bomb"
+C "Caltrops"
diff --git a/wadsrc/static/filter/shadowwarrior/engine/origbinds.txt b/wadsrc/static/filter/shadowwarrior/engine/origbinds.txt
index 91c5b3eef..1eaf623ab 100644
--- a/wadsrc/static/filter/shadowwarrior/engine/origbinds.txt
+++ b/wadsrc/static/filter/shadowwarrior/engine/origbinds.txt
@@ -1,7 +1,7 @@
-M "+MedKit"
-S "+Smoke_Bomb"
-N "+Nightvision"
-G "+Gas_Bomb"
-F "+Flash_Bomb"
-C "+Caltrops"
-Mouse2 "+MediKit"
+M "MedKit"
+S "Smoke_Bomb"
+N "Nightvision"
+G "Gas_Bomb"
+F "Flash_Bomb"
+C "Caltrops"
+Mouse2 "MedKit"