From a40343ae0044133c7511066ca065f7d7f3232679 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 19 Jul 2020 19:44:39 +0200 Subject: [PATCH] - premap.h is also gone because it didn't contain anything relevant anymore. --- source/games/duke/src/game.h | 4 --- source/games/duke/src/player.h | 6 ----- source/games/duke/src/premap.cpp | 1 - source/games/duke/src/premap.h | 38 --------------------------- source/games/duke/src/zz_savegame.cpp | 2 -- 5 files changed, 51 deletions(-) delete mode 100644 source/games/duke/src/premap.h diff --git a/source/games/duke/src/game.h b/source/games/duke/src/game.h index 4a92eff1b..8aa28abd8 100644 --- a/source/games/duke/src/game.h +++ b/source/games/duke/src/game.h @@ -22,10 +22,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #pragma once -#ifndef ONLY_USERDEFS -#include "premap.h" // XXX -#endif - #include "fix16.h" #include "mmulti.h" #include "palette.h" diff --git a/source/games/duke/src/player.h b/source/games/duke/src/player.h index 19955dcd9..94df79e1f 100644 --- a/source/games/duke/src/player.h +++ b/source/games/duke/src/player.h @@ -58,14 +58,8 @@ typedef struct extern uint16_t frags[MAXPLAYERS][MAXPLAYERS]; extern input_t sync[MAXPLAYERS]; -# define PWEAPON(Player, Weapon, Wmember) (aplWeapon ## Wmember [Weapon][Player]) - extern playerdata_t g_player[MAXPLAYERS]; -void P_GetInput(int playerNum); -void P_GetInputMotorcycle(int playerNum); -void P_GetInputBoat(int playerNum); - extern int16_t max_ammo_amount[MAX_WEAPONS]; diff --git a/source/games/duke/src/premap.cpp b/source/games/duke/src/premap.cpp index d06469b96..653db1f78 100644 --- a/source/games/duke/src/premap.cpp +++ b/source/games/duke/src/premap.cpp @@ -28,7 +28,6 @@ Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms #include "ns.h" #include "global.h" -#include "premap.h" #include "mapinfo.h" #include "secrets.h" #include "statistics.h" diff --git a/source/games/duke/src/premap.h b/source/games/duke/src/premap.h deleted file mode 100644 index 2e7097d36..000000000 --- a/source/games/duke/src/premap.h +++ /dev/null @@ -1,38 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 2010 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 premap_h_ -#define premap_h_ - -struct MapRecord; - -BEGIN_DUKE_NS - -extern int16_t ambientlotag[64]; -extern int16_t ambienthitag[64]; -void P_ResetPlayer(int pn); -void G_ResetInterpolations(void); - - -END_DUKE_NS - -#endif diff --git a/source/games/duke/src/zz_savegame.cpp b/source/games/duke/src/zz_savegame.cpp index 32acd5a79..cbdf067cf 100644 --- a/source/games/duke/src/zz_savegame.cpp +++ b/source/games/duke/src/zz_savegame.cpp @@ -22,8 +22,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "ns.h" // Must come before everything else! #include "duke3d.h" -#include "premap.h" -#include "prlights.h" #include "savegame.h" #include "i_specialpaths.h" #include "gamecontrol.h"