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

Limit what startwin.game.cpp needs to include.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6063 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-02-19 22:15:29 +00:00
parent 3faa84f6d4
commit 1aaf246527
2 changed files with 31 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -25,25 +25,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef game_h_ #ifndef game_h_
#define game_h_ #define game_h_
#ifndef ONLY_USERDEFS
#include "premap.h" // XXX #include "premap.h" // XXX
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#ifndef ONLY_USERDEFS
// Compile game-side legacy Room over Room code? // Compile game-side legacy Room over Room code?
#define LEGACY_ROR 1 #define LEGACY_ROR 1
#define USERQUOTE_LEFTOFFSET 5 #define USERQUOTE_LEFTOFFSET 5
#define USERQUOTE_RIGHTOFFSET 14 #define USERQUOTE_RIGHTOFFSET 14
#define MAXRIDECULE 10
#define MAXRIDECULELENGTH 40
#define MAXSAVEGAMES 10
#define MAXSAVEGAMENAME 22
#define MAXPWLOCKOUT 128
#define MAXRTSNAME 128
#if defined(GEKKO) || defined(__OPENDINGUX__) #if defined(GEKKO) || defined(__OPENDINGUX__)
# define VIEWSCREENFACTOR 0 # define VIEWSCREENFACTOR 0
#elif defined(__ANDROID__) #elif defined(__ANDROID__)
@ -128,6 +125,15 @@ extern camera_t g_camera;
# define CAMERACLOCK g_cameraClock # define CAMERACLOCK g_cameraClock
#endif #endif
#endif
#define MAXRIDECULE 10
#define MAXRIDECULELENGTH 40
#define MAXSAVEGAMES 10
#define MAXSAVEGAMENAME 22
#define MAXPWLOCKOUT 128
#define MAXRTSNAME 128
// KEEPINSYNC lunatic/_defs_game.lua // KEEPINSYNC lunatic/_defs_game.lua
typedef struct { typedef struct {
#if !defined LUNATIC #if !defined LUNATIC
@ -234,6 +240,9 @@ typedef struct {
char wchoice[MAX_WEAPONS]; char wchoice[MAX_WEAPONS];
} user_defs; } user_defs;
extern user_defs ud;
#ifndef ONLY_USERDEFS
// this is checked against http://eduke32.com/VERSION // this is checked against http://eduke32.com/VERSION
extern const char *s_buildDate; extern const char *s_buildDate;
@ -286,8 +295,6 @@ extern palette_t DefaultCrosshairColors;
extern uint32_t g_frameDelay; extern uint32_t g_frameDelay;
extern user_defs ud;
int32_t A_CheckInventorySprite(spritetype *s); int32_t A_CheckInventorySprite(spritetype *s);
int32_t A_InsertSprite(int16_t whatsect, int32_t s_x, int32_t s_y, int32_t s_z, int16_t s_pn, int8_t s_s, uint8_t s_xr, int32_t A_InsertSprite(int16_t whatsect, int32_t s_x, int32_t s_y, int32_t s_z, int16_t s_pn, int8_t s_s, uint8_t s_xr,
uint8_t s_yr, int16_t s_a, int16_t s_ve, int16_t s_zv, int16_t s_ow, int16_t s_ss); uint8_t s_yr, int16_t s_a, int16_t s_ve, int16_t s_zv, int16_t s_ow, int16_t s_ss);
@ -520,10 +527,14 @@ EXTERN_INLINE_HEADER void G_SetStatusBarScale(int32_t sc);
EXTERN_INLINE_HEADER void SetIfGreater(int32_t *variable, int32_t potentialValue); EXTERN_INLINE_HEADER void SetIfGreater(int32_t *variable, int32_t potentialValue);
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#ifndef ONLY_USERDEFS
#if defined game_c_ || !defined DISABLE_INLINING #if defined game_c_ || !defined DISABLE_INLINING
EXTERN_INLINE void G_SetStatusBarScale(int32_t sc) EXTERN_INLINE void G_SetStatusBarScale(int32_t sc)
@ -543,3 +554,5 @@ EXTERN_INLINE void SetIfGreater(int32_t *variable, int32_t potentialValue)
#endif #endif
#endif #endif
#endif

12
source/duke3d/src/startwin.game.cpp
View file

@ -29,9 +29,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifdef STARTUP_SETUP_WINDOW #ifdef STARTUP_SETUP_WINDOW
#include "duke3d.h"
#include "build.h" #include "build.h"
#include "cache1d.h"
#include "grpscan.h" #include "grpscan.h"
@ -46,8 +45,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "startwin.game.h" #include "startwin.game.h"
// for ud
#include "keyboard.h"
#include "control.h"
#include "_control.h"
#include "function.h"
#include "inv.h"
#define ONLY_USERDEFS
#include "game.h" #include "game.h"
#include "common.h"
#include "common_game.h" #include "common_game.h"
#define TAB_CONFIG 0 #define TAB_CONFIG 0