diff --git a/source/sw/CMakeLists.txt b/source/sw/CMakeLists.txt index fd7ddc1bc..20212c51f 100644 --- a/source/sw/CMakeLists.txt +++ b/source/sw/CMakeLists.txt @@ -9,8 +9,6 @@ set( PCH_SOURCES src/cache.cpp src/cheats.cpp src/colormap.cpp - src/config.cpp - src/console.cpp src/coolg.cpp src/coolie.cpp src/copysect.cpp diff --git a/source/sw/src/config.cpp b/source/sw/src/config.cpp deleted file mode 100644 index 7eb35ddf3..000000000 --- a/source/sw/src/config.cpp +++ /dev/null @@ -1,66 +0,0 @@ -//------------------------------------------------------------------------- -/* -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 "build.h" -#include "baselayer.h" -#include "gamecvars.h" - -#include "settings.h" -#include "mytypes.h" -#include "gamedefs.h" -#include "gamecontrol.h" -#include "sounds.h" - -// we load this in to get default button and key assignments -// as well as setting up function mappings - -#include "baselayer.h" - - -BEGIN_SW_NS - -// -// Comm variables -// - -int32_t NumberPlayers,CommPort,PortSpeed,IrqNumber,UartAddress; - -/* -=================== -= -= CONFIG_ReadSetup -= -=================== -*/ - -int32_t CONFIG_ReadSetup(void) -{ - memcpy(&gs, &gs_defaults, sizeof(gs)); - return 0; -} - -END_SW_NS diff --git a/source/sw/src/console.cpp b/source/sw/src/console.cpp deleted file mode 100644 index dc2ed4dac..000000000 --- a/source/sw/src/console.cpp +++ /dev/null @@ -1,102 +0,0 @@ -//------------------------------------------------------------------------- -/* -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 -*/ -//------------------------------------------------------------------------- - -// CONSOLE.C -// Handles all argument storing and user console variable modifications. -// Copyright (c) 1996 by Jim Norwood - -#include "ns.h" - -#include "build.h" - -#include "mytypes.h" -#include "names2.h" -#include "panel.h" -#include "game.h" -#include "tags.h" -#include "player.h" -#include "lists.h" -#include "quake.h" - -#include "gamecontrol.h" - -#include "menus.h" -#include "network.h" -#include "pal.h" - -#include "weapon.h" -#include "misc.h" -#include "jsector.h" - -BEGIN_SW_NS - -void CON_Bunny(void) -{ - PLAYERp pp = Player + myconnectindex; - - if (CommEnabled) - return; - - pp->BunnyMode = !pp->BunnyMode; - if (pp->BunnyMode) - PutStringInfo(pp,"Bunny rockets enabled!"); - else - PutStringInfo(pp,"Bunny rockets disabled!"); -} - -void CON_ShowMirror(void) -{ - char base[80]; - int16_t op1=0; - - // Format: showmirror [SpriteNum] - if (sscanf(MessageInputString,"%s %hd",base,&op1) < 2) - { - strcpy(MessageInputString,"help showmirror"); - return; - } - - if (op1 < 0 || op1 > 9) - { - Printf("Mirror number is out of range!"); - return; - } - - Printf("camera is the ST1 sprite used as the view spot"); - Printf("camspite is the SpriteNum of the drawtotile tile in editart"); - Printf("camspic is the tile number of the drawtotile in editart"); - Printf("iscamera is whether or not this mirror is a camera type"); - Printf(" "); - Printf("mirror[%d].mirrorwall = %d",op1,mirror[op1].mirrorwall); - Printf("mirror[%d].mirrorsector = %d",op1,mirror[op1].mirrorsector); - Printf("mirror[%d].camera = %d",op1,mirror[op1].camera); - Printf("mirror[%d].camsprite = %d",op1,mirror[op1].camsprite); - Printf("mirror[%d].campic = %d",op1,mirror[op1].campic); - Printf("mirror[%d].iscamera = %d",op1,mirror[op1].ismagic); -} - - -END_SW_NS diff --git a/source/sw/src/game.cpp b/source/sw/src/game.cpp index 44ab69020..3a091abea 100644 --- a/source/sw/src/game.cpp +++ b/source/sw/src/game.cpp @@ -2477,7 +2477,7 @@ int32_t GameInterface::app_main() automapping = 1; BorderAdjust = true; - CONFIG_ReadSetup(); + gs = gs_defaults; hud_size.Callback(); diff --git a/source/sw/src/osdcmds.cpp b/source/sw/src/osdcmds.cpp index 6d186f884..2f6963446 100644 --- a/source/sw/src/osdcmds.cpp +++ b/source/sw/src/osdcmds.cpp @@ -45,6 +45,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "demo.h" // g_firstDemoFile[] #include "menus.h" #include "mapinfo.h" +#include "jsector.h" BEGIN_SW_NS @@ -174,11 +175,59 @@ static int osdcmd_warptocoords(CCmdFuncPtr parm) return CCMD_OK; } +static int osdcmd_bunny(CCmdFuncPtr parm) +{ + PLAYERp pp = Player + myconnectindex; + + if (CommEnabled) + return CCMD_OK; + + pp->BunnyMode = !pp->BunnyMode; + if (pp->BunnyMode) + PutStringInfo(pp, "Bunny rockets enabled!"); + else + PutStringInfo(pp, "Bunny rockets disabled!"); + return CCMD_OK; +} + +static int osdcmd_mirror(CCmdFuncPtr parm) +{ + char base[80]; + int16_t op1 = 0; + + if (parm->numparms < 1) + { + return CCMD_SHOWHELP; + } + + if (op1 < 0 || op1 > 9) + { + Printf("Mirror number is out of range!"); + return CCMD_OK; + } + + Printf("camera is the ST1 sprite used as the view spot"); + Printf("camspite is the SpriteNum of the drawtotile tile in editart"); + Printf("camspic is the tile number of the drawtotile in editart"); + Printf("iscamera is whether or not this mirror is a camera type"); + Printf(" "); + Printf("mirror[%d].mirrorwall = %d", op1, mirror[op1].mirrorwall); + Printf("mirror[%d].mirrorsector = %d", op1, mirror[op1].mirrorsector); + Printf("mirror[%d].camera = %d", op1, mirror[op1].camera); + Printf("mirror[%d].camsprite = %d", op1, mirror[op1].camsprite); + Printf("mirror[%d].campic = %d", op1, mirror[op1].campic); + Printf("mirror[%d].iscamera = %d", op1, mirror[op1].ismagic); + return CCMD_OK; +} + + int32_t registerosdcommands(void) { C_RegisterFunction("map","map : loads the given map", osdcmd_map); C_RegisterFunction("give","give : gives requested item", osdcmd_give); C_RegisterFunction("god","god: toggles god mode", osdcmd_god); + C_RegisterFunction("bunny", "bunny: toggles bunny rocket mode", osdcmd_bunny); + C_RegisterFunction("mirror", "mirror [mirrornum]: print mirror debug info", osdcmd_mirror); C_RegisterFunction("noclip","noclip: toggles clipping mode", osdcmd_noclip);