- fixed compilation.

This commit is contained in:
Christoph Oelckers 2019-10-27 23:18:44 +01:00
parent 43da4b68a2
commit 68b64d2091
5 changed files with 1 additions and 16 deletions

View file

@ -786,7 +786,6 @@ set (PCH_SOURCES
common/gameconfigfile.cpp common/gameconfigfile.cpp
common/gamecvars.cpp common/gamecvars.cpp
common/gamecontrol.cpp common/gamecontrol.cpp
common/inputstate.cpp
common/2d/v_2ddrawer.cpp common/2d/v_2ddrawer.cpp
common/2d/v_draw.cpp common/2d/v_draw.cpp

View file

@ -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 // we load this in to get default button and key assignments
// as well as setting up function mappings // as well as setting up function mappings
#define __SETUP__ // JBF 20031211
#include "_functio.h"
BEGIN_BLD_NS BEGIN_BLD_NS

View file

@ -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 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); 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 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); CGameMenuItemZBool itemOptionsGameBoolViewBobbing("VIEW BOBBING:", 3, 66, 90, 180, cl_viewvbob, SetViewBobbing, NULL, NULL);

View file

@ -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 // we load this in to get default button and key assignments
// as well as setting up function mappings // as well as setting up function mappings
#define __SETUP__ // JBF 20031211
#include "_functio.h"
BEGIN_DUKE_NS BEGIN_DUKE_NS

View file

@ -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 // we load this in to get default button and key assignments
// as well as setting up function mappings // as well as setting up function mappings
#define __SETUP__ // JBF 20031211
#include "_functio.h"
BEGIN_RR_NS BEGIN_RR_NS
void CONFIG_SetDefaults(void) void CONFIG_SetDefaults(void)
{ {