- 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

@ -14,7 +14,6 @@ endif()
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../build/include
${CMAKE_CURRENT_SOURCE_DIR}/../mact/include
${CMAKE_CURRENT_SOURCE_DIR}/../audiolib/include
${CMAKE_CURRENT_SOURCE_DIR}/../libsmackerdec/include
${CMAKE_CURRENT_SOURCE_DIR}/../thirdparty/include
@ -25,6 +24,7 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../common/fonts
${CMAKE_CURRENT_SOURCE_DIR}/../common/2d
${CMAKE_CURRENT_SOURCE_DIR}/../common/music
${CMAKE_CURRENT_SOURCE_DIR}/../common/input
${CMAKE_CURRENT_SOURCE_DIR}/../platform
)

View file

@ -26,7 +26,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "renderlayer.h"
#include "duke3d.h"
#include "animlib.h"
#include "mouse.h"
#include "compat.h"
#include "input.h"

View file

@ -31,7 +31,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "compat.h"
#include "fx_man.h"
#include "keyboard.h"
#include "pragmas.h"
#include "polymost.h"
@ -115,7 +114,6 @@ END_RR_NS
#include "actors.h"
#include "common_game.h"
#include "config.h"
#include "control.h"
#include "gamecontrol.h"
#include "game.h"
#include "gamedef.h"

View file

@ -6844,7 +6844,6 @@ static void G_Cleanup(void)
void G_Shutdown(void)
{
S_SoundShutdown();
CONTROL_Shutdown();
G_SetFog(0);
engineUnInit();
G_Cleanup();