- hooked up ZDoom' joystick code and removed the remaining parts of the old MACT input library.

This commit is contained in:
Christoph Oelckers 2019-12-14 20:15:15 +01:00
parent 957d997353
commit d23b4a7e33
55 changed files with 79 additions and 1376 deletions

View file

@ -37,7 +37,6 @@
#include "basics.h"
#include "zstring.h"
#include "c_bind.h"
#include "control.h"
#include "gamecontrol.h"
//=============================================================================
@ -198,7 +197,7 @@ char const* C_CON_GetGameFuncOnJoystick(int gameFunc)
FString C_CON_GetBoundKeyForLastInput(int gameFunc)
{
if (CONTROL_LastSeenInput == LastSeenInput::Joystick)
if (inputState.gamePadActive())
{
FString name = C_CON_GetGameFuncOnJoystick(gameFunc);
if (name.IsNotEmpty())