Reduce scope of ifdef(D1||D2)
This commit is contained in:
Kp
parent
f42a3fe241
commit
d73e5a24c3
|
|
@ -56,51 +56,52 @@ typedef enum {
|
|||
// Mpl - Multiplayer Options
|
||||
// Edi - Editor Options
|
||||
// Dbg - Debugging/Undocumented Options
|
||||
#if defined(DXX_BUILD_DESCENT_I) || defined(DXX_BUILD_DESCENT_II)
|
||||
#include <string>
|
||||
#include "dxxsconf.h"
|
||||
#include "pack.h"
|
||||
#include "compiler-type_traits.h"
|
||||
|
||||
struct Arg
|
||||
struct Arg : prohibit_void_ptr<Arg>
|
||||
{
|
||||
int SysShowCmdHelp;
|
||||
int SysNoNiceFPS;
|
||||
int SysMaxFPS;
|
||||
int SysNoHogDir;
|
||||
int SysUsePlayersDir;
|
||||
int SysLowMem;
|
||||
std::string SysHogDir;
|
||||
std::string SysPilot;
|
||||
std::string SysRecordDemoNameTemplate;
|
||||
bool SysShowCmdHelp;
|
||||
bool SysNoNiceFPS;
|
||||
bool SysNoHogDir;
|
||||
bool SysUsePlayersDir;
|
||||
bool SysLowMem;
|
||||
bool SysAutoRecordDemo;
|
||||
int SysWindow;
|
||||
int SysNoBorders;
|
||||
int SysAutoDemo;
|
||||
#ifdef DXX_BUILD_DESCENT_I
|
||||
int SysNoTitles;
|
||||
#endif
|
||||
#ifdef DXX_BUILD_DESCENT_II
|
||||
int SysNoMovies;
|
||||
#endif
|
||||
int CtlNoCursor;
|
||||
int CtlNoMouse;
|
||||
int CtlNoJoystick;
|
||||
int CtlNoStickyKeys;
|
||||
int SndNoSound;
|
||||
int SndNoMusic;
|
||||
bool SysWindow;
|
||||
bool SysNoBorders;
|
||||
bool SysAutoDemo;
|
||||
bool CtlNoCursor;
|
||||
bool CtlNoMouse;
|
||||
bool CtlNoJoystick;
|
||||
bool CtlNoStickyKeys;
|
||||
bool SndNoSound;
|
||||
bool SndNoMusic;
|
||||
#ifdef USE_SDLMIXER
|
||||
bool SndDisableSdlMixer;
|
||||
#else
|
||||
static constexpr tt::true_type SndDisableSdlMixer{};
|
||||
#endif
|
||||
#ifdef DXX_BUILD_DESCENT_II
|
||||
int SndDigiSampleRate;
|
||||
int GfxSkipHiresMovie;
|
||||
int GfxSkipHiresGFX;
|
||||
bool GfxSkipHiresFNT;
|
||||
#if defined(DXX_BUILD_DESCENT_I) || defined(DXX_BUILD_DESCENT_II)
|
||||
#ifdef DXX_BUILD_DESCENT_I
|
||||
bool SysNoTitles;
|
||||
bool EdiNoBm;
|
||||
#endif
|
||||
#ifdef DXX_BUILD_DESCENT_II
|
||||
bool SysNoMovies;
|
||||
bool GfxSkipHiresMovie;
|
||||
bool GfxSkipHiresGFX;
|
||||
int SndDigiSampleRate;
|
||||
#endif
|
||||
int GfxSkipHiresFNT;
|
||||
#ifdef OGL
|
||||
int OglFixedFont;
|
||||
bool DbgUseOldTextureMerge;
|
||||
bool OglFixedFont;
|
||||
SyncGLMethod OglSyncMethod;
|
||||
int OglSyncWait;
|
||||
#endif
|
||||
|
|
@ -111,27 +112,23 @@ struct Arg
|
|||
uint16_t MplTrackerPort;
|
||||
std::string MplTrackerAddr;
|
||||
#endif
|
||||
#ifdef DXX_BUILD_DESCENT_I
|
||||
int EdiNoBm;
|
||||
#endif
|
||||
#ifdef DXX_BUILD_DESCENT_II
|
||||
std::string EdiAutoLoad;
|
||||
int EdiSaveHoardData;
|
||||
int EdiMacData; // also used for some read routines in non-editor build
|
||||
bool EdiSaveHoardData;
|
||||
bool EdiMacData; // also used for some read routines in non-editor build
|
||||
#endif
|
||||
int DbgVerbose;
|
||||
int DbgSafelog;
|
||||
int DbgNoRun;
|
||||
int DbgForbidConsoleGrab;
|
||||
int DbgRenderStats;
|
||||
bool DbgSafelog;
|
||||
bool DbgNoRun;
|
||||
bool DbgForbidConsoleGrab;
|
||||
bool DbgRenderStats;
|
||||
std::string DbgAltTex;
|
||||
std::string DbgTexMap;
|
||||
int DbgShowMemInfo;
|
||||
int DbgNoDoubleBuffer;
|
||||
int DbgNoCompressPigBitmap;
|
||||
bool DbgShowMemInfo;
|
||||
bool DbgNoDoubleBuffer;
|
||||
bool DbgNoCompressPigBitmap;
|
||||
int DbgBpp;
|
||||
#ifdef OGL
|
||||
int DbgUseOldTextureMerge;
|
||||
int DbgGlIntensity4Ok;
|
||||
int DbgGlLuminance4Alpha4Ok;
|
||||
int DbgGlRGBA2Ok;
|
||||
|
|
@ -141,10 +138,12 @@ struct Arg
|
|||
int DbgSdlHWSurface;
|
||||
int DbgSdlASyncBlit;
|
||||
#endif
|
||||
#endif
|
||||
};
|
||||
|
||||
extern struct Arg GameArg;
|
||||
|
||||
#if defined(DXX_BUILD_DESCENT_I) || defined(DXX_BUILD_DESCENT_II)
|
||||
static inline const char *PLAYER_DIRECTORY_STRING(const char *s, const char *f) __attribute_format_arg(2);
|
||||
static inline const char *PLAYER_DIRECTORY_STRING(const char *s, const char *)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -715,6 +715,7 @@ struct netplayer_info : prohibit_void_ptr<netplayer_info>
|
|||
fix64 LastPacketTime;
|
||||
};
|
||||
|
||||
#if defined(DXX_BUILD_DESCENT_I) || defined(DXX_BUILD_DESCENT_II)
|
||||
/*
|
||||
* The Network Game structure
|
||||
* Contains protocol-specific data with designated prefixes and general game-related data.
|
||||
|
|
@ -787,6 +788,7 @@ struct netgame_info : prohibit_void_ptr<netgame_info>, ignore_window_pointer_t
|
|||
ubyte Tracker;
|
||||
#endif
|
||||
};
|
||||
#endif
|
||||
|
||||
namespace multi
|
||||
{
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
|
||||
#pragma once
|
||||
|
||||
#if defined(DXX_BUILD_DESCENT_I) || defined(DXX_BUILD_DESCENT_II)
|
||||
#include <physfs.h>
|
||||
#include "sounds.h"
|
||||
#include "inferno.h"
|
||||
|
|
@ -97,6 +96,7 @@ void piggy_read_sound_data(digi_sound *snd);
|
|||
|
||||
void piggy_load_level_data();
|
||||
|
||||
#if defined(DXX_BUILD_DESCENT_I) || defined(DXX_BUILD_DESCENT_II)
|
||||
#if defined(DXX_BUILD_DESCENT_I)
|
||||
#define MAX_BITMAP_FILES 1800
|
||||
#define MAX_SOUND_FILES MAX_SOUNDS
|
||||
|
|
@ -151,6 +151,7 @@ void load_d1_bitmap_replacements();
|
|||
*/
|
||||
bitmap_index read_extra_bitmap_d1_pig(const char *name);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
* reads a bitmap_index structure from a PHYSFS_file
|
||||
|
|
@ -181,4 +182,3 @@ int read_hamfile();
|
|||
void swap_0_255(grs_bitmap *bmp);
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
|
||||
#pragma once
|
||||
|
||||
#if defined(DXX_BUILD_DESCENT_I) || defined(DXX_BUILD_DESCENT_II)
|
||||
#include <physfs.h>
|
||||
#include "vecmat.h"
|
||||
#include "weapon.h"
|
||||
|
|
@ -158,6 +157,7 @@ struct callsign_t
|
|||
};
|
||||
static_assert(sizeof(callsign_t) == CALLSIGN_LEN + 1, "callsign_t too big");
|
||||
|
||||
#if defined(DXX_BUILD_DESCENT_I) || defined(DXX_BUILD_DESCENT_II)
|
||||
// When this structure changes, increment the constant
|
||||
// SAVE_FILE_VERSION in playsave.c
|
||||
struct player : public prohibit_void_ptr<player>
|
||||
|
|
@ -286,6 +286,7 @@ static_assert(sizeof(player_rw) == 116, "wrong size player_rw");
|
|||
#elif defined(DXX_BUILD_DESCENT_II)
|
||||
static_assert(sizeof(player_rw) == 142, "wrong size player_rw");
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#define N_PLAYER_GUNS 8
|
||||
#define N_PLAYER_SHIP_TEXTURES 32
|
||||
|
|
@ -311,6 +312,7 @@ typedef array<playernum_t, MAX_PLAYERS> playernum_array_t;
|
|||
extern unsigned N_players; // Number of players ( >1 means a net game, eh?)
|
||||
extern playernum_t Player_num; // The player number who is on the console.
|
||||
|
||||
#if defined(DXX_BUILD_DESCENT_I) || defined(DXX_BUILD_DESCENT_II)
|
||||
#if defined(DXX_BUILD_DESCENT_I)
|
||||
#define DXX_PLAYER_HEADER_ADD_EXTRA_PLAYERS 0
|
||||
#elif defined(DXX_BUILD_DESCENT_II)
|
||||
|
|
@ -318,6 +320,7 @@ extern playernum_t Player_num; // The player number who is on the console.
|
|||
#endif
|
||||
extern array<player, MAX_PLAYERS + DXX_PLAYER_HEADER_ADD_EXTRA_PLAYERS> Players; // Misc player info
|
||||
void player_rw_swap(player_rw *p, int swap);
|
||||
#endif
|
||||
|
||||
extern array<object *, MAX_PLAYERS> Guided_missile;
|
||||
extern array<object_signature_t, MAX_PLAYERS> Guided_missile_sig;
|
||||
|
|
@ -327,6 +330,5 @@ extern array<object_signature_t, MAX_PLAYERS> Guided_missile_sig;
|
|||
*/
|
||||
void player_ship_read(player_ship *ps, PHYSFS_file *fp);
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue