From 22e41413957e509b6879b1d972c56a2997093b07 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 23 Jun 2020 22:01:58 +0200 Subject: [PATCH] - removed duplicate header. --- source/games/duke/src/duke3d.h | 69 +++++---- source/games/duke/src/duke3d_ed.h | 229 ---------------------------- source/games/duke/src/game_main.cpp | 1 - source/games/duke/src/gamedefs.h | 0 source/games/duke/src/gameexec.cpp | 2 +- source/games/duke/src/zz_sbar.cpp | 6 +- 6 files changed, 38 insertions(+), 269 deletions(-) delete mode 100644 source/games/duke/src/duke3d_ed.h delete mode 100644 source/games/duke/src/gamedefs.h diff --git a/source/games/duke/src/duke3d.h b/source/games/duke/src/duke3d.h index 241923726..69365dee6 100644 --- a/source/games/duke/src/duke3d.h +++ b/source/games/duke/src/duke3d.h @@ -57,7 +57,6 @@ extern int32_t g_fakeMultiMode; #define RECSYNCBUFSIZ 2520 //2520 is the (LCM of 1-8)*3 #define MOVEFIFOSIZ 256 -// KEEPINSYNC lunatic/con_lang.lua #define MAXLEVELS 64 #define MAXGAMETYPES 16 @@ -153,45 +152,45 @@ enum GameFunction_t gamefunc_Strafe_Right, gamefunc_Aim_Up, gamefunc_Aim_Down, - gamefunc_Weapon_1, - gamefunc_Weapon_2, - gamefunc_Weapon_3, - gamefunc_Weapon_4, - gamefunc_Weapon_5, - gamefunc_Weapon_6, - gamefunc_Weapon_7, - gamefunc_Weapon_8, - gamefunc_Weapon_9, - gamefunc_Weapon_10, - gamefunc_Inventory, - gamefunc_Inventory_Left, - gamefunc_Inventory_Right, - gamefunc_Holo_Duke, // Duke3D, RR - gamefunc_Jetpack, - gamefunc_NightVision, - gamefunc_MedKit, + gamefunc_Weapon_1, // CCMD + gamefunc_Weapon_2, // CCMD + gamefunc_Weapon_3, // CCMD + gamefunc_Weapon_4, // CCMD + gamefunc_Weapon_5, // CCMD + gamefunc_Weapon_6, // CCMD + gamefunc_Weapon_7, // CCMD + gamefunc_Weapon_8, // CCMD + gamefunc_Weapon_9, // CCMD + gamefunc_Weapon_10, // CCMD + gamefunc_Inventory, // CCMD + gamefunc_Inventory_Left, // CCMD + gamefunc_Inventory_Right, // CCMD + gamefunc_Holo_Duke, // CCMD // Duke3D, RR + gamefunc_Jetpack, // CCMD + gamefunc_NightVision, // CCMD + gamefunc_MedKit, // CCMD gamefunc_TurnAround, gamefunc_SendMessage, - gamefunc_Map, - gamefunc_Shrink_Screen, - gamefunc_Enlarge_Screen, - gamefunc_Center_View, - gamefunc_Holster_Weapon, - gamefunc_Show_Opponents_Weapon, - gamefunc_Map_Follow_Mode, - gamefunc_See_Coop_View, - gamefunc_Mouse_Aiming, - gamefunc_Toggle_Crosshair, - gamefunc_Steroids, - gamefunc_Quick_Kick, - gamefunc_Next_Weapon, - gamefunc_Previous_Weapon, + gamefunc_Map, // CCMD + gamefunc_Shrink_Screen, // CCMD + gamefunc_Enlarge_Screen, // CCMD + gamefunc_Center_View, // CCMD + gamefunc_Holster_Weapon, // CCMD + gamefunc_Show_Opponents_Weapon, // CCMD + gamefunc_Map_Follow_Mode, // CCMD + gamefunc_See_Coop_View, // CCMD + gamefunc_Mouse_Aiming, // CCMD + gamefunc_Toggle_Crosshair, // CCMD + gamefunc_Steroids, // CCMD + gamefunc_Quick_Kick, // CCMD + gamefunc_Next_Weapon, // CCMD + gamefunc_Previous_Weapon, // CCMD gamefunc_Dpad_Select, gamefunc_Dpad_Aiming, - gamefunc_Last_Weapon, + gamefunc_Last_Weapon, // CCMD gamefunc_Alt_Weapon, - gamefunc_Third_Person_View, - gamefunc_Show_DukeMatch_Scores, + gamefunc_Third_Person_View, // CCMD + gamefunc_Show_DukeMatch_Scores, // CCMD gamefunc_Toggle_Crouch, // This is the last one used by EDuke32. NUM_ACTIONS }; diff --git a/source/games/duke/src/duke3d_ed.h b/source/games/duke/src/duke3d_ed.h deleted file mode 100644 index 470de576d..000000000 --- a/source/games/duke/src/duke3d_ed.h +++ /dev/null @@ -1,229 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 2016 EDuke32 developers and contributors - -This file is part of EDuke32. - -EDuke32 is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 2 -as published by the Free Software Foundation. - -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. -*/ -//------------------------------------------------------------------------- - -#ifndef duke3d_h_ -#define duke3d_h_ - -// JBF -#include "baselayer.h" -#include "build.h" - -#include "compat.h" - -#include "pragmas.h" - -#include "polymost.h" -#include "gamecvars.h" -#include "menu/menu.h" - -BEGIN_DUKE_NS - -#define VOLUMEALL (g_Shareware == 0) -#define PLUTOPAK (true)//g_scriptVersion >= 14) -#define VOLUMEONE (g_Shareware == 1) - -// increase by 3, because atomic GRP adds 1, and Shareware adds 2 -// Non-Lua build -# define BYTEVERSION_EDUKE32 336 - -//#define BYTEVERSION_13 27 -//#define BYTEVERSION_14 116 -//#define BYTEVERSION_15 117 -#define BYTEVERSION (BYTEVERSION_EDUKE32+(PLUTOPAK?1:(VOLUMEONE<<1))) - -#define NUMPAGES 1 - -#define RECSYNCBUFSIZ 2520 //2520 is the (LCM of 1-8)*3 -#define MOVEFIFOSIZ 256 - -#define MAXLEVELS 64 -#define MAXGAMETYPES 16 - -enum { - MUS_FIRST_SPECIAL = MAXVOLUMES*MAXLEVELS, - - MUS_INTRO = MUS_FIRST_SPECIAL, - MUS_BRIEFING = MUS_FIRST_SPECIAL + 1, - MUS_LOADING = MUS_FIRST_SPECIAL + 2, -}; - -////////// TIMING CONSTANTS ////////// -// The number of 'totalclock' increments per second: -#define TICRATE 120 -// The number of game state updates per second: -#define REALGAMETICSPERSEC 30 -// The number of 'totalclock' increments per game state update: -// NOTE: calling a game state update a 'frame' is really weird. -// (This used to be TICRATE/GAMETICSPERSEC, which was 120/26 = 4.615~ truncated -// to 4 by integer division.) -#define TICSPERFRAME (TICRATE/REALGAMETICSPERSEC) -// Used as a constant to satisfy all of the calculations written with ticrate = -// 26 in mind: -#define GAMETICSPERSEC 26 - - -#define PACKBUF_SIZE 32768 - -#define TILE_SAVESHOT (MAXTILES-1) -#define TILE_LOADSHOT (MAXTILES-3) -#define TILE_TILT (MAXTILES-2) -#define TILE_ANIM (MAXTILES-4) -#define TILE_VIEWSCR (MAXTILES-5) -// Reserved: TILE_VIEWSCR_1 (MAXTILES-6) -// Reserved: TILE_VIEWSCR_2 (MAXTILES-7) -EDUKE32_STATIC_ASSERT(7 <= MAXTILES-MAXUSERTILES); - -// sprites with these statnums should be considered for fixing -#define ROTFIXSPR_STATNUMP(k) ((k)==STAT_DEFAULT || (k)==STAT_STANDABLE || (k)==STAT_FX || \ - (k)==STAT_FALLER || (k)==STAT_LIGHT) -#define ROTFIXSPR_MAGIC 0x18190000 - -// JBF 20040604: sync is a function on some platforms -#define sync dsync - -// Uncomment the following to remove calls to a.nasm functions with the GL renderers -// so that debugging with valgrind --smc-check=none is possible: -//#define DEBUG_VALGRIND_NO_SMC - -END_DUKE_NS - -#include "actors.h" -#include "common_game.h" -#include "gamecontrol.h" -#include "game.h" -#include "gamedef.h" -#include "gamedefs.h" -#include "gameexec.h" -#include "gamevar.h" -#include "global.h" -#include "inv.h" -#include "macros.h" -#include "namesdyn.h" -#include "net.h" -#include "player.h" -#include "quotes.h" -#include "rts.h" -#include "text.h" -#include "sector.h" -#include "sounds.h" -#include "soundefs.h" - -BEGIN_DUKE_NS - -// Order is that of EDuke32 by necessity because it exposes the key binds to scripting by index instead of by name. -enum GameFunction_t -{ - gamefunc_Move_Forward, - gamefunc_Move_Backward, - gamefunc_Turn_Left, - gamefunc_Turn_Right, - gamefunc_Strafe, - gamefunc_Fire, - gamefunc_Open, - gamefunc_Run, - gamefunc_Alt_Fire, // Duke3D, Blood - gamefunc_Jump, - gamefunc_Crouch, - gamefunc_Look_Up, - gamefunc_Look_Down, - gamefunc_Look_Left, - gamefunc_Look_Right, - gamefunc_Strafe_Left, - gamefunc_Strafe_Right, - gamefunc_Aim_Up, - gamefunc_Aim_Down, - gamefunc_Weapon_1, // CCMD - gamefunc_Weapon_2, // CCMD - gamefunc_Weapon_3, // CCMD - gamefunc_Weapon_4, // CCMD - gamefunc_Weapon_5, // CCMD - gamefunc_Weapon_6, // CCMD - gamefunc_Weapon_7, // CCMD - gamefunc_Weapon_8, // CCMD - gamefunc_Weapon_9, // CCMD - gamefunc_Weapon_10, // CCMD - gamefunc_Inventory, // CCMD - gamefunc_Inventory_Left, // CCMD - gamefunc_Inventory_Right, // CCMD - gamefunc_Holo_Duke, // CCMD // Duke3D, RR - gamefunc_Jetpack, // CCMD - gamefunc_NightVision, // CCMD - gamefunc_MedKit, // CCMD - gamefunc_TurnAround, - gamefunc_SendMessage, - gamefunc_Map, // CCMD - gamefunc_Shrink_Screen, // CCMD - gamefunc_Enlarge_Screen, // CCMD - gamefunc_Center_View, // CCMD - gamefunc_Holster_Weapon, // CCMD - gamefunc_Show_Opponents_Weapon, // CCMD - gamefunc_Map_Follow_Mode, // CCMD - gamefunc_See_Coop_View, // CCMD - gamefunc_Mouse_Aiming, // CCMD - gamefunc_Toggle_Crosshair, // CCMD - gamefunc_Steroids, // CCMD - gamefunc_Quick_Kick, // CCMD - gamefunc_Next_Weapon, // CCMD - gamefunc_Previous_Weapon, // CCMD - gamefunc_Dpad_Select, - gamefunc_Dpad_Aiming, - gamefunc_Last_Weapon, // CCMD - gamefunc_Alt_Weapon, - gamefunc_Third_Person_View, // CCMD - gamefunc_Show_DukeMatch_Scores, // CCMD - gamefunc_Toggle_Crouch, // This is the last one used by EDuke32. - NUM_ACTIONS -}; - -struct GameInterface : ::GameInterface -{ - const char* Name() override { return "Redneck"; } - int app_main() override; - void UpdateScreenSize() override; - void FreeGameData() override; - bool GenerateSavePic() override; - bool validate_hud(int) override; - void set_hud_layout(int size) override; - void set_hud_scale(int size) override; - FString statFPS() override; - GameStats getStats() override; - void DrawNativeMenuText(int fontnum, int state, double xpos, double ypos, float fontscale, const char* text, int flags) override; - void MenuOpened() override; - void MenuSound(EMenuSounds snd) override; - void MenuClosed() override; - bool CanSave() override; - void StartGame(FNewGameStartup& gs) override; - FSavegameInfo GetSaveSig() override; - void DrawCenteredTextScreen(const DVector2& origin, const char* text, int position, bool bg) override; - void DrawMenuCaption(const DVector2& origin, const char* text) override; - bool SaveGame(FSaveGameNode*) override; - bool LoadGame(FSaveGameNode*) override; - void DoPrintMessage(int prio, const char* text) override; - void DrawPlayerSprite(const DVector2& origin, bool onteam) override; - void QuitToTitle() override; - FString GetCoordString() override; - int GetStringTile(int font, const char* t, int f) override; -}; - -END_DUKE_NS - -#endif diff --git a/source/games/duke/src/game_main.cpp b/source/games/duke/src/game_main.cpp index f6c51faf8..bd6033247 100644 --- a/source/games/duke/src/game_main.cpp +++ b/source/games/duke/src/game_main.cpp @@ -31,7 +31,6 @@ Modifications for JonoF's port by Jonathon Fowler (jf@jonof.id.au) #include "demo.h" #include "screens.h" #include "baselayer.h" -#include "cmdline.h" #include "m_argv.h" BEGIN_DUKE_NS diff --git a/source/games/duke/src/gamedefs.h b/source/games/duke/src/gamedefs.h deleted file mode 100644 index e69de29bb..000000000 diff --git a/source/games/duke/src/gameexec.cpp b/source/games/duke/src/gameexec.cpp index a63c88f4f..83a76d256 100644 --- a/source/games/duke/src/gameexec.cpp +++ b/source/games/duke/src/gameexec.cpp @@ -33,7 +33,7 @@ source as it is released. //------------------------------------------------------------------------- #include "ns.h" #include "concmd.h" -#include "duke3d_ed.h" +#include "duke3d.h" #include "gamedef.h" #include "gamevar.h" #include "gameexec.h" diff --git a/source/games/duke/src/zz_sbar.cpp b/source/games/duke/src/zz_sbar.cpp index db32b9ecc..fef93fabb 100644 --- a/source/games/duke/src/zz_sbar.cpp +++ b/source/games/duke/src/zz_sbar.cpp @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include #include "v_font.h" -#include "duke3d_ed.h" +#include "duke3d.h" #include "compat.h" #include "sbar.h" #include "statusbar.h" @@ -724,7 +724,7 @@ public: FString format; - if ((g_netServer || ud.multimode > 1) && (g_gametypeFlags[ud.coop] & GAMETYPE_FRAGBAR)) + if (ud.multimode > 1 && (g_gametypeFlags[ud.coop] & GAMETYPE_FRAGBAR)) { DrawGraphic(tileGetTexture(TILE_KILLSICON), 228, top + 8, DI_ITEM_OFFSETS, 1, 0, 0, 1, 1); format.Format("%d", max(p->frag - p->fraggedself, 0)); @@ -823,7 +823,7 @@ public: FString format; - if ((g_netServer || ud.multimode > 1) && (g_gametypeFlags[ud.coop] & GAMETYPE_FRAGBAR)) + if (ud.multimode > 1 && (g_gametypeFlags[ud.coop] & GAMETYPE_FRAGBAR)) { DrawGraphic(tileGetTexture(TILE_KILLSICON), 228, top + 8, DI_ITEM_OFFSETS, 1, 0, 0, 1, 1); format.Format("%d", max(p->frag - p->fraggedself, 0));