From 68b64d2091635ec1878eab746ffee4244f1c67a8 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 27 Oct 2019 23:18:44 +0100 Subject: [PATCH] - fixed compilation. --- source/CMakeLists.txt | 1 - source/blood/src/config.cpp | 3 --- source/blood/src/menu.cpp | 2 +- source/duke3d/src/config.cpp | 3 --- source/rr/src/config.cpp | 8 -------- 5 files changed, 1 insertion(+), 16 deletions(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 9373371b5..501cbd087 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -786,7 +786,6 @@ set (PCH_SOURCES common/gameconfigfile.cpp common/gamecvars.cpp common/gamecontrol.cpp - common/inputstate.cpp common/2d/v_2ddrawer.cpp common/2d/v_draw.cpp diff --git a/source/blood/src/config.cpp b/source/blood/src/config.cpp index 0b8b9f952..3e12336c3 100644 --- a/source/blood/src/config.cpp +++ b/source/blood/src/config.cpp @@ -48,9 +48,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // we load this in to get default button and key assignments // as well as setting up function mappings -#define __SETUP__ // JBF 20031211 -#include "_functio.h" - BEGIN_BLD_NS diff --git a/source/blood/src/menu.cpp b/source/blood/src/menu.cpp index 8462b212f..e79b6d3ee 100644 --- a/source/blood/src/menu.cpp +++ b/source/blood/src/menu.cpp @@ -410,7 +410,7 @@ CGameMenuItemTitle itemOptionsGameTitle("GAME SETUP", 1, 160, 20, 2038); CGameMenuItemZBool itemOptionsGameBoolWeaponsV10X("V1.0x WEAPONS BALANCE:", 3, 66, 130, 180, gWeaponsV10x, SetWeaponsV10X, NULL, NULL); /////////////////// -CGameMenuItemZBool itemOptionsGameBoolShowPlayerNames("SHOW PLAYER NAMES:", 3, 66, 60, 180, gShowPlayerNames, SetShowPlayerNames, NULL, NULL); +CGameMenuItemZBool itemOptionsGameBoolShowPlayerNames("SHOW PLAYER NAMES:", 3, 66, 60, 180, cl_idplayers, SetShowPlayerNames, NULL, NULL); CGameMenuItemZCycle itemOptionsGameShowWeapons("SHOW WEAPONS:", 3, 66, 70, 180, 0, SetShowWeapons, pzShowWeaponStrings, ARRAY_SSIZE(pzShowWeaponStrings), 0); CGameMenuItemZBool itemOptionsGameBoolSlopeTilting("SLOPE TILTING:", 3, 66, 80, 180, cl_slopetilting, SetSlopeTilting, NULL, NULL); CGameMenuItemZBool itemOptionsGameBoolViewBobbing("VIEW BOBBING:", 3, 66, 90, 180, cl_viewvbob, SetViewBobbing, NULL, NULL); diff --git a/source/duke3d/src/config.cpp b/source/duke3d/src/config.cpp index b2290a828..1221b00df 100644 --- a/source/duke3d/src/config.cpp +++ b/source/duke3d/src/config.cpp @@ -36,9 +36,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // we load this in to get default button and key assignments // as well as setting up function mappings -#define __SETUP__ // JBF 20031211 -#include "_functio.h" - BEGIN_DUKE_NS diff --git a/source/rr/src/config.cpp b/source/rr/src/config.cpp index 20727a5dd..229cd234b 100644 --- a/source/rr/src/config.cpp +++ b/source/rr/src/config.cpp @@ -34,16 +34,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // we load this in to get default button and key assignments // as well as setting up function mappings -#define __SETUP__ // JBF 20031211 -#include "_functio.h" - BEGIN_RR_NS - - - - - void CONFIG_SetDefaults(void) {