Big args code refactoring, fixed issue with userdir d2x.ini, and a few other small things
This commit is contained in:
parent
6584e989a0
commit
69492c702f
|
@ -5,6 +5,9 @@ D2X-Rebirth Changelog
|
|||
arch/linux/arch_ip.cpp, main/ip_base.cpp, main/ip_base.h, main/ipclient.cpp: Fixed port deformation while sending handshake
|
||||
d2x.ini, arch/sdl/digi.c, arch/sdl/digi_audio.c, arch/sdl/digi_mixer.c, main/inferno.c, main/menu.c, main/args.c: Fixed some command-line options
|
||||
main/game.c: Increased Rear_view_leave_time to 0x4000
|
||||
include/physfsx.h, main/args.c: Big code refactoring, fixed issue with userdir d2x.ini
|
||||
SConstruct: micro version now specified as the "micro" scons flag
|
||||
arch/sdl/digi_mixer.c, libmve/mveplay.c: various small fixes
|
||||
|
||||
20071011
|
||||
--------
|
||||
|
|
24
SConstruct
24
SConstruct
|
@ -7,22 +7,10 @@ import SCons.Util
|
|||
|
||||
PROGRAM_NAME = 'D2X-Rebirth'
|
||||
|
||||
#SVN_REVISION = os.popen('echo -n `LANG=C svn info | grep ^Revision | cut -d\ -f2`').read()
|
||||
|
||||
# version number
|
||||
D2XMAJOR = 0
|
||||
D2XMINOR = 52
|
||||
|
||||
# optional micro revision: set it to SVN_REVISION if available, zero otherwise.
|
||||
D2XMICRO = 0
|
||||
#D2XMICRO = int(SVN_REVISION)
|
||||
|
||||
VERSION_STRING = ' v' + str(D2XMAJOR) + '.' + str(D2XMINOR)
|
||||
if (D2XMICRO):
|
||||
VERSION_STRING += '.' + str(D2XMICRO)
|
||||
|
||||
print '\n===== ' + PROGRAM_NAME + VERSION_STRING + ' =====\n'
|
||||
|
||||
# installation path
|
||||
PREFIX = '/usr/local/'
|
||||
BIN_SUBDIR = 'bin/'
|
||||
|
@ -40,6 +28,18 @@ editor = int(ARGUMENTS.get('editor', 0))
|
|||
console = int(ARGUMENTS.get('console',0))
|
||||
sdlmixer = int(ARGUMENTS.get('sdlmixer', 0))
|
||||
arm = int(ARGUMENTS.get('arm', 0))
|
||||
micro = int(ARGUMENTS.get('micro', 0))
|
||||
|
||||
if (micro > 0):
|
||||
D2XMICRO = micro
|
||||
else:
|
||||
D2XMICRO = 0
|
||||
|
||||
VERSION_STRING = ' v' + str(D2XMAJOR) + '.' + str(D2XMINOR)
|
||||
if (D2XMICRO):
|
||||
VERSION_STRING += '.' + str(D2XMICRO)
|
||||
|
||||
print '\n===== ' + PROGRAM_NAME + VERSION_STRING + ' =====\n'
|
||||
|
||||
# general source files
|
||||
common_sources = [
|
||||
|
|
|
@ -66,12 +66,10 @@ Mix_Chunk SoundChunks[MAX_SOUNDS];
|
|||
|
||||
/* Initialise audio */
|
||||
int digi_mixer_init() {
|
||||
GameArg.SndDigiSampleRate = SAMPLE_RATE_44K;
|
||||
|
||||
if (MIX_DIGI_DEBUG) printf("digi_init %d (SDL_Mixer)\n", MAX_SOUNDS);
|
||||
if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0) Error("SDL audio initialisation failed: %s.", SDL_GetError());
|
||||
|
||||
if (Mix_OpenAudio(GameArg.SndDigiSampleRate, MIX_OUTPUT_FORMAT, MIX_OUTPUT_CHANNELS, SOUND_BUFFER_SIZE)) {
|
||||
if (Mix_OpenAudio(SAMPLE_RATE_44K, MIX_OUTPUT_FORMAT, MIX_OUTPUT_CHANNELS, SOUND_BUFFER_SIZE)) {
|
||||
//edited on 10/05/98 by Matt Mueller - should keep running, just with no sound.
|
||||
printf("\nError: Couldn't open audio: %s\n", SDL_GetError());
|
||||
return 1;
|
||||
|
|
|
@ -57,12 +57,20 @@ static inline void PHYSFSX_init(int argc, char *argv[])
|
|||
{
|
||||
// This stuff below seems overly complicated - brad
|
||||
|
||||
/* MD2211 - 2007/10/12
|
||||
* Fully agreed. We could do much better.
|
||||
* First, PHYSFS_getUserDir() should be used for UNIX at least, instead of '~".
|
||||
* Second, the current sequence of reading, modifying search dir, then
|
||||
* re-reading args, is VERY confusing and was broken. It has temporarily been
|
||||
* fixed in misc/args.c, but the entire thing need to be revamped IMHO.
|
||||
*/
|
||||
|
||||
char *path = GameArg.SysUserDir;
|
||||
char fullPath[PATH_MAX + 5];
|
||||
|
||||
#if defined(__unix__)
|
||||
if (!GameArg.SysUserDir)
|
||||
path = "~/.d2x-rebirth";
|
||||
path = "~/.d2x-rebirth/";
|
||||
#endif
|
||||
PHYSFS_removeFromSearchPath(PHYSFS_getBaseDir());
|
||||
|
||||
|
|
|
@ -364,9 +364,11 @@ static int create_audiobuf_handler(unsigned char major, unsigned char minor, uns
|
|||
format = AUDIO_U8;
|
||||
}
|
||||
|
||||
fprintf(stderr, "creating audio buffers:\n");
|
||||
fprintf(stderr, "sample rate = %d, stereo = %d, bitsize = %d, compressed = %d\n",
|
||||
sample_rate, stereo, bitsize ? 16 : 8, compressed);
|
||||
if (!GameArg.SndSdlMixer) {
|
||||
fprintf(stderr, "creating audio buffers:\n");
|
||||
fprintf(stderr, "sample rate = %d, stereo = %d, bitsize = %d, compressed = %d\n",
|
||||
sample_rate, stereo, bitsize ? 16 : 8, compressed);
|
||||
}
|
||||
|
||||
mve_audio_spec = (SDL_AudioSpec *)mve_alloc(sizeof(SDL_AudioSpec));
|
||||
mve_audio_spec->freq = sample_rate;
|
||||
|
|
396
misc/args.c
396
misc/args.c
|
@ -47,11 +47,16 @@ static char rcsid[] = "$Id: args.c,v 1.1.1.1 2006/03/17 19:58:51 zicodxx Exp $";
|
|||
|
||||
#define MAX_ARGS 1000
|
||||
|
||||
#define INI_FILENAME "d2x.ini"
|
||||
#define MAXIMUM_FPS 80 //FIXME this is definitely not the place for such a constant
|
||||
|
||||
int Num_args=0;
|
||||
char * Args[MAX_ARGS];
|
||||
|
||||
struct Arg GameArg;
|
||||
|
||||
void ReadCmdArgs(void);
|
||||
|
||||
int FindArg(char *s)
|
||||
{
|
||||
int i;
|
||||
|
@ -91,7 +96,6 @@ int FindResArg(char *prefix, int *sw, int *sh)
|
|||
}
|
||||
|
||||
return 0;
|
||||
|
||||
}
|
||||
|
||||
void AppendIniArgs(void)
|
||||
|
@ -99,9 +103,10 @@ void AppendIniArgs(void)
|
|||
PHYSFS_file *f;
|
||||
char *line,*word;
|
||||
|
||||
f = PHYSFSX_openReadBuffered("d2x.ini");
|
||||
f = PHYSFSX_openReadBuffered(INI_FILENAME);
|
||||
|
||||
if(f) {
|
||||
printf("Found %s\n", INI_FILENAME);
|
||||
while(!PHYSFS_eof(f) && Num_args < MAX_ARGS)
|
||||
{
|
||||
line=fgets_unlimited(f);
|
||||
|
@ -116,6 +121,25 @@ void AppendIniArgs(void)
|
|||
}
|
||||
PHYSFS_close(f);
|
||||
}
|
||||
|
||||
/* FIXME This was previously called in InitArgs, just after AppendIniArgs,
|
||||
* and broke the userdir d2x.ini.
|
||||
* PHYSFSX_init() in include/physfx.h should be reorganized, in order to
|
||||
* fix this in a cleaner way.
|
||||
*/
|
||||
ReadCmdArgs();
|
||||
}
|
||||
|
||||
// Utility function to get an integer provided as argument
|
||||
int get_int_arg(char *arg_name, int default_value) {
|
||||
int t;
|
||||
return ((t = FindArg(arg_name)) ? atoi(Args[t+1]) : default_value);
|
||||
|
||||
}
|
||||
// Utility function to get a string provided as argument
|
||||
char *get_str_arg(char *arg_name, char *default_value) {
|
||||
int t;
|
||||
return ((t = FindArg(arg_name)) ? Args[t+1] : default_value);
|
||||
}
|
||||
|
||||
// All FindArg calls should be here to keep the code clean
|
||||
|
@ -125,132 +149,48 @@ void ReadCmdArgs(void)
|
|||
|
||||
// System Options
|
||||
|
||||
if (FindArg( "-help" ) || FindArg( "-h" ) || FindArg( "-?" ) || FindArg( "?" ))
|
||||
GameArg.SysShowCmdHelp = 1;
|
||||
else
|
||||
GameArg.SysShowCmdHelp = 0;
|
||||
GameArg.SysShowCmdHelp = (FindArg( "-help" ) || FindArg( "-h" ) || FindArg( "-?" ) || FindArg( "?" ));
|
||||
GameArg.SysFPSIndicator = FindArg("-fps");
|
||||
GameArg.SysUseNiceFPS = FindArg("-nicefps");
|
||||
|
||||
if (FindArg("-fps"))
|
||||
GameArg.SysFPSIndicator = 1;
|
||||
else
|
||||
GameArg.SysFPSIndicator = 0;
|
||||
GameArg.SysMaxFPS = get_int_arg("-maxfps", MAXIMUM_FPS);
|
||||
if (GameArg.SysMaxFPS <= 0 || GameArg.SysMaxFPS > MAXIMUM_FPS)
|
||||
GameArg.SysMaxFPS = MAXIMUM_FPS;
|
||||
|
||||
if (FindArg("-nicefps"))
|
||||
GameArg.SysUseNiceFPS = 1;
|
||||
else
|
||||
GameArg.SysUseNiceFPS = 0;
|
||||
GameArg.SysHogDir = get_str_arg("-hogdir", NULL);
|
||||
if (GameArg.SysHogDir == NULL)
|
||||
GameArg.SysNoHogDir = FindArg("-nohogdir");
|
||||
|
||||
if ((t = FindArg("-maxfps"))) {
|
||||
t=atoi(Args[t+1]);
|
||||
if (t>0&&t<=80)
|
||||
GameArg.SysMaxFPS=t;
|
||||
else
|
||||
GameArg.SysMaxFPS=80;
|
||||
}
|
||||
else
|
||||
GameArg.SysMaxFPS=80;
|
||||
|
||||
if ((t=FindArg("-hogdir")))
|
||||
GameArg.SysHogDir = Args[t+1];
|
||||
else
|
||||
{
|
||||
GameArg.SysHogDir = NULL;
|
||||
if (FindArg("-nohogdir"))
|
||||
GameArg.SysNoHogDir = 1;
|
||||
else
|
||||
GameArg.SysNoHogDir = 0;
|
||||
}
|
||||
|
||||
if ((t = FindArg("-userdir")))
|
||||
GameArg.SysUserDir = Args[t+1];
|
||||
else
|
||||
GameArg.SysUserDir = NULL;
|
||||
|
||||
if (FindArg("-use_players_dir"))
|
||||
GameArg.SysUsePlayersDir = 1;
|
||||
else
|
||||
GameArg.SysUsePlayersDir = 0;
|
||||
|
||||
if (FindArg("-lowmem"))
|
||||
GameArg.SysLowMem = 1;
|
||||
else
|
||||
GameArg.SysLowMem = 0;
|
||||
|
||||
if (FindArg("-legacyhomers"))
|
||||
GameArg.SysLegacyHomers = 1;
|
||||
else
|
||||
GameArg.SysLegacyHomers = 0;
|
||||
|
||||
if ((t = FindArg( "-pilot" )))
|
||||
GameArg.SysPilot = Args[t+1];
|
||||
else
|
||||
GameArg.SysPilot = NULL;
|
||||
|
||||
if (FindArg("-autodemo"))
|
||||
GameArg.SysAutoDemo = 1;
|
||||
else
|
||||
GameArg.SysAutoDemo = 0;
|
||||
|
||||
if (FindArg("-window"))
|
||||
GameArg.SysWindow = 1;
|
||||
else
|
||||
GameArg.SysWindow = 0;
|
||||
|
||||
if (FindArg("-nomovies"))
|
||||
GameArg.SysNoMovies = 1;
|
||||
else
|
||||
GameArg.SysNoMovies = 0;
|
||||
GameArg.SysUserDir = get_str_arg("-userdir", NULL);
|
||||
GameArg.SysUsePlayersDir = FindArg("-use_players_dir");
|
||||
GameArg.SysLowMem = FindArg("-lowmem");
|
||||
GameArg.SysLegacyHomers = FindArg("-legacyhomers");
|
||||
GameArg.SysPilot = get_str_arg("-pilot", NULL);
|
||||
GameArg.SysWindow = FindArg("-window");
|
||||
GameArg.SysNoMovies = FindArg("-nomovies");
|
||||
GameArg.SysAutoDemo = FindArg("-autodemo");
|
||||
|
||||
// Control Options
|
||||
|
||||
if (FindArg("-nomouse"))
|
||||
GameArg.CtlNoMouse = 1;
|
||||
else
|
||||
GameArg.CtlNoMouse = 0;
|
||||
|
||||
if (FindArg("-nojoystick"))
|
||||
GameArg.CtlNoJoystick = 1;
|
||||
else
|
||||
GameArg.CtlNoJoystick = 0;
|
||||
|
||||
if (FindArg("-mouselook"))
|
||||
GameArg.CtlMouselook = 1;
|
||||
else
|
||||
GameArg.CtlMouselook = 0;
|
||||
|
||||
if (FindArg("-grabmouse"))
|
||||
GameArg.CtlGrabMouse = 1;
|
||||
else
|
||||
GameArg.CtlGrabMouse = 0;
|
||||
GameArg.CtlNoMouse = FindArg("-nomouse");
|
||||
GameArg.CtlNoJoystick = FindArg("-nojoystick");
|
||||
GameArg.CtlMouselook = FindArg("-mouselook");
|
||||
GameArg.CtlGrabMouse = FindArg("-grabmouse");
|
||||
|
||||
// Sound Options
|
||||
|
||||
if (FindArg("-nosound"))
|
||||
GameArg.SndNoSound = 1;
|
||||
else
|
||||
GameArg.SndNoSound = 0;
|
||||
|
||||
if (FindArg("-nomusic"))
|
||||
GameArg.SndNoMusic = 1;
|
||||
else
|
||||
GameArg.SndNoMusic = 0;
|
||||
|
||||
if (FindArg("-sound11k"))
|
||||
GameArg.SndDigiSampleRate = SAMPLE_RATE_11K;
|
||||
else
|
||||
GameArg.SndDigiSampleRate = SAMPLE_RATE_22K;
|
||||
|
||||
if (FindArg("-redbook"))
|
||||
GameArg.SndEnableRedbook = 1;
|
||||
else
|
||||
GameArg.SndEnableRedbook = 0;
|
||||
GameArg.SndNoSound = FindArg("-nosound");
|
||||
GameArg.SndNoMusic = FindArg("-nomusic");
|
||||
GameArg.SndDigiSampleRate = (FindArg("-sound11k") ? SAMPLE_RATE_11K : SAMPLE_RATE_22K);
|
||||
GameArg.SndEnableRedbook = FindArg("-redbook");
|
||||
|
||||
#ifdef USE_SDLMIXER
|
||||
GameArg.SndSdlMixer = FindArg("-sdlmixer");
|
||||
GameArg.SndJukebox = (t = FindArg("-jukebox") ? Args[t+1] : NULL);
|
||||
GameArg.SndExternalMusic = (t = FindArg("-music_ext") ? Args[t+1] : NULL);
|
||||
GameArg.SndSdlMixer = FindArg("-sdlmixer");
|
||||
GameArg.SndJukebox = get_str_arg("-jukebox", NULL);
|
||||
GameArg.SndExternalMusic = get_str_arg("-music_ext", NULL);
|
||||
#endif
|
||||
|
||||
|
||||
// Graphics Options
|
||||
|
||||
if ((t=FindResArg("aspect", &y, &x)))
|
||||
|
@ -274,20 +214,9 @@ void ReadCmdArgs(void)
|
|||
else
|
||||
GameArg.GfxGaugeHudMode = 0;
|
||||
|
||||
if (FindArg("-persistentdebris"))
|
||||
GameArg.GfxPersistentDebris = 1;
|
||||
else
|
||||
GameArg.GfxPersistentDebris = 0;
|
||||
|
||||
if (FindArg( "-lowresmovies" ))
|
||||
GameArg.GfxMovieHires = 0;
|
||||
else
|
||||
GameArg.GfxMovieHires = 1;
|
||||
|
||||
if (FindArg("-subtitles"))
|
||||
GameArg.GfxMovieSubtitles = 1;
|
||||
else
|
||||
GameArg.GfxMovieSubtitles = 0;
|
||||
GameArg.GfxPersistentDebris = FindArg("-persistentdebris");
|
||||
GameArg.GfxMovieHires = !FindArg( "-lowresmovies" );
|
||||
GameArg.GfxMovieSubtitles = FindArg("-subtitles");
|
||||
|
||||
#ifdef OGL
|
||||
// OpenGL Options
|
||||
|
@ -308,192 +237,63 @@ void ReadCmdArgs(void)
|
|||
GameArg.OglTexMinFilt = GL_NEAREST;
|
||||
}
|
||||
|
||||
if (FindArg("-gl_transparency"))
|
||||
GameArg.OglAlphaEffects = 1;
|
||||
else
|
||||
GameArg.OglAlphaEffects = 0;
|
||||
GameArg.OglAlphaEffects = FindArg("-gl_transparency");
|
||||
GameArg.OglVoodooHack = FindArg("-gl_voodoo");
|
||||
GameArg.OglFixedFont = FindArg("-fixedfont");
|
||||
GameArg.OglReticle = get_int_arg("-gl_reticle", 0);
|
||||
|
||||
if ((t=FindArg("-gl_reticle")))
|
||||
GameArg.OglReticle = atoi(Args[t+1]);
|
||||
else
|
||||
GameArg.OglReticle = 0;
|
||||
|
||||
if (FindArg("-gl_voodoo"))
|
||||
GameArg.OglVoodooHack = 1;
|
||||
else
|
||||
GameArg.OglVoodooHack = 0;
|
||||
|
||||
if (FindArg("-fixedfont"))
|
||||
GameArg.OglFixedFont = 1;
|
||||
else
|
||||
GameArg.OglFixedFont = 0;
|
||||
#endif
|
||||
|
||||
// Multiplayer Options
|
||||
|
||||
if (FindArg("-mprofile"))
|
||||
GameArg.MplGameProfile = 1;
|
||||
else
|
||||
GameArg.MplGameProfile = 0;
|
||||
|
||||
if (FindArg("-norankings"))
|
||||
GameArg.MplNoRankings = 1;
|
||||
else
|
||||
GameArg.MplNoRankings = 0;
|
||||
|
||||
if (FindArg("-noredundancy"))
|
||||
GameArg.MplNoRedundancy = 1;
|
||||
else
|
||||
GameArg.MplNoRedundancy = 0;
|
||||
|
||||
if (FindArg("-playermessages"))
|
||||
GameArg.MplPlayerMessages = 1;
|
||||
else
|
||||
GameArg.MplPlayerMessages = 0;
|
||||
|
||||
if ((t=FindArg("-ipxnetwork")) && Args[t+1])
|
||||
GameArg.MplIpxNetwork = Args[t+1];
|
||||
else
|
||||
GameArg.MplIpxNetwork = NULL;
|
||||
|
||||
if ((t=FindArg("-ipxbasesocket")) && Args[t+1])
|
||||
GameArg.MplIPXSocketOffset = atoi(Args[t+1]);
|
||||
else
|
||||
GameArg.MplIPXSocketOffset = 0;
|
||||
|
||||
if ((t=FindArg("-ip_hostaddr")))
|
||||
GameArg.MplIpHostAddr = Args[t+1];
|
||||
else
|
||||
GameArg.MplIpHostAddr = "";
|
||||
|
||||
if (FindArg("-ip_nogetmyaddr"))
|
||||
GameArg.MplIpNoGetMyAddr = 1;
|
||||
else
|
||||
GameArg.MplIpNoGetMyAddr = 0;
|
||||
|
||||
if ((t=FindArg("-ip_myaddr")))
|
||||
GameArg.MplIpMyAddr = Args[t+1];
|
||||
else
|
||||
GameArg.MplIpMyAddr = NULL;
|
||||
|
||||
if ((t=FindArg("-ip_baseport")))
|
||||
GameArg.MplIpBasePort = atoi(Args[t+1]);
|
||||
else
|
||||
GameArg.MplIpBasePort = 0;
|
||||
GameArg.MplGameProfile = FindArg("-mprofile");
|
||||
GameArg.MplNoRankings = FindArg("-norankings");
|
||||
GameArg.MplNoRedundancy = FindArg("-noredundancy");
|
||||
GameArg.MplPlayerMessages = FindArg("-playermessages");
|
||||
GameArg.MplIpxNetwork = get_str_arg("-ipxnetwork", NULL);
|
||||
GameArg.MplIPXSocketOffset = get_int_arg("-ipxbasesocket", 0);
|
||||
GameArg.MplIpHostAddr = get_str_arg("-ip_hostaddr", "");
|
||||
GameArg.MplIpNoGetMyAddr = FindArg("-ip_nogetmyaddr");
|
||||
GameArg.MplIpMyAddr = get_str_arg("-ip_myaddr", NULL);
|
||||
GameArg.MplIpBasePort = get_int_arg("-ip_baseport", 0);
|
||||
|
||||
#ifdef EDITOR
|
||||
// Editor Options
|
||||
|
||||
if ((t=FindArg( "-autoload" )))
|
||||
GameArg.EdiAutoLoad = Args[t+1];
|
||||
else
|
||||
GameArg.EdiAutoLoad = NULL;
|
||||
|
||||
if (FindArg("-macdata"))
|
||||
GameArg.EdiMacData = 1;
|
||||
else
|
||||
GameArg.EdiMacData = 0;
|
||||
|
||||
if (FindArg("-hoarddata"))
|
||||
GameArg.EdiSaveHoardData = 1;
|
||||
else
|
||||
GameArg.EdiSaveHoardData = 0;
|
||||
GameArg.EdiAutoLoad = get_str_arg("-autoload", NULL);
|
||||
GameArg.EdiMacData = FindArg("-macdata");
|
||||
GameArg.EdiSaveHoardData = FindArg("-hoarddata");
|
||||
#endif
|
||||
|
||||
// Debug Options
|
||||
|
||||
if (FindArg("-debug"))
|
||||
GameArg.DbgVerbose = 2;
|
||||
else if (FindArg("-verbose"))
|
||||
GameArg.DbgVerbose = 1;
|
||||
else
|
||||
GameArg.DbgVerbose = 0;
|
||||
if (FindArg("-debug")) GameArg.DbgVerbose = 2;
|
||||
else if (FindArg("-verbose")) GameArg.DbgVerbose = 1;
|
||||
else GameArg.DbgVerbose = 0;
|
||||
|
||||
if (FindArg("-norun"))
|
||||
GameArg.DbgNoRun = 1;
|
||||
else
|
||||
GameArg.DbgNoRun = 0;
|
||||
|
||||
if (FindArg("-renderstats"))
|
||||
GameArg.DbgRenderStats = 1;
|
||||
else
|
||||
GameArg.DbgRenderStats = 0;
|
||||
|
||||
if ((t=FindArg("-text")))
|
||||
GameArg.DbgAltTex = Args[t+1];
|
||||
else
|
||||
GameArg.DbgAltTex = NULL;
|
||||
|
||||
if ((t=FindArg("-tmap")))
|
||||
GameArg.DbgTexMap = Args[t+1];
|
||||
else
|
||||
GameArg.DbgTexMap = NULL;
|
||||
|
||||
if (FindArg( "-showmeminfo" ))
|
||||
GameArg.DbgShowMemInfo = 1;
|
||||
else
|
||||
GameArg.DbgShowMemInfo = 0;
|
||||
|
||||
if (FindArg("-nodoublebuffer"))
|
||||
GameArg.DbgUseDoubleBuffer = 0;
|
||||
else
|
||||
GameArg.DbgUseDoubleBuffer = 1;
|
||||
|
||||
if (FindArg("-bigpig"))
|
||||
GameArg.DbgBigPig = 0;
|
||||
else
|
||||
GameArg.DbgBigPig = 1;
|
||||
GameArg.DbgNoRun = FindArg("-norun");
|
||||
GameArg.DbgRenderStats = FindArg("-renderstats");
|
||||
GameArg.DbgAltTex = get_str_arg("-text", NULL);
|
||||
GameArg.DbgTexMap = get_str_arg("-tmap", NULL);
|
||||
GameArg.DbgShowMemInfo = FindArg("-showmeminfo");
|
||||
GameArg.DbgUseDoubleBuffer = !FindArg("-nodoublebuffer");
|
||||
GameArg.DbgBigPig = !FindArg("-bigpig");
|
||||
|
||||
#ifdef OGL
|
||||
if (FindArg("-gl_oldtexmerge"))
|
||||
GameArg.DbgAltTexMerge = 0;
|
||||
else
|
||||
GameArg.DbgAltTexMerge = 1;
|
||||
GameArg.DbgAltTexMerge = !FindArg("-gl_oldtexmerge");
|
||||
GameArg.DbgGlBpp = (FindArg("-gl_16bpp") ? 16 : 32);
|
||||
GameArg.DbgGlIntensity4Ok = get_int_arg("-gl_intensity4_ok", 1);
|
||||
GameArg.DbgGlLuminance4Alpha4Ok = get_int_arg("-gl_luminance4_alpha4_ok", 1);
|
||||
GameArg.DbgGlRGBA2Ok = get_int_arg("-gl_rgba2_ok", 1);
|
||||
GameArg.DbgGlReadPixelsOk = get_int_arg("-gl_readpixels_ok", 1);
|
||||
GameArg.DbgGlGetTexLevelParamOk = get_int_arg("-gl_gettexlevelparam_ok", 1);
|
||||
GameArg.DbgGlSetGammaRampOk = get_int_arg("-gl_setgammaramp_ok", 0);
|
||||
|
||||
if (FindArg("-gl_16bpp"))
|
||||
GameArg.DbgGlBpp = 16;
|
||||
else
|
||||
GameArg.DbgGlBpp = 32;
|
||||
|
||||
if ((t=FindArg("-gl_intensity4_ok")))
|
||||
GameArg.DbgGlIntensity4Ok = atoi(Args[t+1]);
|
||||
else
|
||||
GameArg.DbgGlIntensity4Ok = 1;
|
||||
|
||||
if ((t=FindArg("-gl_luminance4_alpha4_ok")))
|
||||
GameArg.DbgGlLuminance4Alpha4Ok = atoi(Args[t+1]);
|
||||
else
|
||||
GameArg.DbgGlLuminance4Alpha4Ok = 1;
|
||||
|
||||
if ((t=FindArg("-gl_rgba2_ok")))
|
||||
GameArg.DbgGlRGBA2Ok = atoi(Args[t+1]);
|
||||
else
|
||||
GameArg.DbgGlRGBA2Ok = 1;
|
||||
|
||||
if ((t=FindArg("-gl_readpixels_ok")))
|
||||
GameArg.DbgGlReadPixelsOk = atoi(Args[t+1]);
|
||||
else
|
||||
GameArg.DbgGlReadPixelsOk = 1;
|
||||
|
||||
if ((t=FindArg("-gl_gettexlevelparam_ok")))
|
||||
GameArg.DbgGlGetTexLevelParamOk = atoi(Args[t+1]);
|
||||
else
|
||||
GameArg.DbgGlGetTexLevelParamOk = 1;
|
||||
|
||||
if ((t=FindArg("-gl_setgammaramp_ok")))
|
||||
GameArg.DbgGlSetGammaRampOk = atoi(Args[t+1]);
|
||||
else
|
||||
GameArg.DbgGlSetGammaRampOk = 0;
|
||||
|
||||
if ((t=FindArg("-gl_vidmem")))
|
||||
GameArg.DbgGlMemTarget = atoi(Args[t+1])*1024*1024;
|
||||
else
|
||||
GameArg.DbgGlMemTarget = -1;
|
||||
GameArg.DbgGlMemTarget = get_int_arg("-gl_vidmem", -1);
|
||||
if (GameArg.DbgGlMemTarget > 0)
|
||||
GameArg.DbgGlMemTarget *= 1024 * 1024;
|
||||
#else
|
||||
if (FindArg("-hwsurface"))
|
||||
GameArg.DbgSdlHWSurface = 1;
|
||||
else
|
||||
GameArg.DbgSdlHWSurface = 0;
|
||||
GameArg.DbgSdlHWSurface = FindArg("-hwsurface");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -520,7 +320,7 @@ void InitArgs( int argc,char **argv )
|
|||
}
|
||||
|
||||
AppendIniArgs();
|
||||
ReadCmdArgs();
|
||||
//ReadCmdArgs();
|
||||
|
||||
atexit(args_exit);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue