zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 01:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix issue with a couple symbols from cmdline.h sometimes picking up different linkage due to accidental double definition in game.h

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7239 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2018-11-18 19:03:40 +00:00
parent 6d7537aa27
commit 1c83bd0a01
6 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/duke3d/src/cmdline.h
View file

@ -20,6 +20,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
//-------------------------------------------------------------------------
#ifndef cmdline_h__
#define cmdline_h__
#include "compat.h"
extern void G_CheckCommandLine(int32_t argc, char const * const * argv);
extern void G_ShowParameterHelp(void);
extern void G_ShowDebugHelp(void);
@ -33,3 +38,4 @@ extern const char *CommandMap;
extern const char *CommandName;
extern int32_t g_forceWeaponChoice;
extern int32_t g_fakeMultiMode;
#endif // cmdline_h__

2
source/duke3d/src/game.h
View file

@ -318,8 +318,6 @@ extern int32_t g_cameraDistance;
#endif
extern int32_t g_crosshairSum;
extern int32_t g_doQuickSave;
extern int32_t g_forceWeaponChoice;
extern int32_t g_fakeMultiMode;
extern int32_t g_levelTextTime;
extern int32_t g_quitDeadline;
extern int32_t g_restorePalette;

1
source/duke3d/src/gameexec.cpp
View file

@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//-------------------------------------------------------------------------
#include "anim.h"
#include "cmdline.h"
#include "colmatch.h"
#include "compat.h"
#include "debugbreak.h"

13
source/duke3d/src/osdcmds.cpp
View file

@ -20,14 +20,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
//-------------------------------------------------------------------------
#include "duke3d.h"
#include "osdcmds.h"
#include "menus.h"
#include "osdfuncs.h"
#include "demo.h" // g_firstDemoFile[]
#include "cheats.h"
#include "sbar.h"
#include "cmdline.h"
#include "demo.h" // g_firstDemoFile[]
#include "duke3d.h"
#include "menus.h"
#include "osdcmds.h"
#include "osdfuncs.h"
#include "savegame.h"
#include "sbar.h"
#ifdef LUNATIC
# include "lunatic_game.h"

5
source/duke3d/src/premap.cpp
View file

@ -20,10 +20,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
//-------------------------------------------------------------------------
#include "duke3d.h"
#include "anim.h"
#include "menus.h"
#include "cmdline.h"
#include "demo.h"
#include "duke3d.h"
#include "menus.h"
#include "savegame.h"
#ifdef LUNATIC

1
source/duke3d/src/startgtk.game.cpp
View file

@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//-------------------------------------------------------------------------
#include "build.h"
#include "cmdline.h"
#include "common.h"
#include "common_game.h"
#include "compat.h"