From 95533db358cb52c7414535dbb99f1db4087b11cc Mon Sep 17 00:00:00 2001
From: zicodxx <>
Date: Fri, 12 Oct 2007 14:21:21 +0000
Subject: [PATCH] Fixed some command-line options

---
 CHANGELOG.txt         |  1 +
 arch/sdl/digi.c       |  3 +--
 arch/sdl/digi_audio.c |  2 +-
 d2x.ini               |  1 -
 main/inferno.c        | 11 +++++------
 main/menu.c           |  2 +-
 misc/args.c           |  5 +++++
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 7fedfe5ee..6cb0d3cbb 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@ D2X-Rebirth Changelog
 20070112
 --------
 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, main/inferno.c, main/menu.c, main/args.c: Fixed some command-line options
 
 20071011
 --------
diff --git a/arch/sdl/digi.c b/arch/sdl/digi.c
index 86b0c13a9..b859e0187 100644
--- a/arch/sdl/digi.c
+++ b/arch/sdl/digi.c
@@ -110,7 +110,6 @@ void digi_select_system(int n) {
 static int digi_initialised = 0;
 static int digi_max_channels = 16;
 
-int digi_sample_rate = SAMPLE_RATE_22K;
 int digi_volume = SOUND_MAX_VOLUME;
 int midi_volume = SOUND_MAX_VOLUME;
 
@@ -121,7 +120,7 @@ void digi_set_volume(int dvolume, int mvolume) {
 	if (fptr_set_midi_volume) digi_set_midi_volume(mvolume);
 }
 
-void digi_set_sample_rate(int r) { digi_sample_rate = r; }
+void digi_set_sample_rate(int r) { GameArg.SndDigiSampleRate = r; }
 
 /* Stub functions */
 
diff --git a/arch/sdl/digi_audio.c b/arch/sdl/digi_audio.c
index 4f7bb3a24..916a45376 100644
--- a/arch/sdl/digi_audio.c
+++ b/arch/sdl/digi_audio.c
@@ -196,7 +196,7 @@ int digi_audio_init()
 		Error("SDL audio initialisation failed: %s.",SDL_GetError());
 	}
 	
-	WaveSpec.freq = digi_sample_rate;
+	WaveSpec.freq = GameArg.SndDigiSampleRate;
 	//added/changed by Sam Lantinga on 12/01/98 for new SDL version
 	WaveSpec.format = AUDIO_U8;
 	WaveSpec.channels = 2;
diff --git a/d2x.ini b/d2x.ini
index 02cec94ac..31d3cc99d 100644
--- a/d2x.ini
+++ b/d2x.ini
@@ -34,7 +34,6 @@
 ;-aspect<Y>x<X>     use specified aspect
 ;-hud <n>           Set hud mode.  0=normal 1-3=new
 ;-persistentdebris  Enable persistent debris. Works in singleplayer only
-;-window            Run the game in a window
 ;-lowresmovies      Play low resolution movies if available (for slow machines)
 ;-subtitles         Turn on movie subtitles
 
diff --git a/main/inferno.c b/main/inferno.c
index 7a9376d11..e65bb762a 100644
--- a/main/inferno.c
+++ b/main/inferno.c
@@ -355,13 +355,12 @@ int main(int argc, char *argv[])
 
 	key_init();
 
-	if (!GameArg.SndNoSound) {
-		digi_select_system(
-			GameArg.SndSdlMixer || GameArg.SndExternalMusic || GameArg.SndJukebox ?
-			SDLMIXER_SYSTEM : SDLAUDIO_SYSTEM
-		);
+	digi_select_system(
+		GameArg.SndSdlMixer || GameArg.SndExternalMusic || GameArg.SndJukebox ?
+		SDLMIXER_SYSTEM : SDLAUDIO_SYSTEM
+	);
+	if (!GameArg.SndNoSound)
 		digi_init();
-	}
 
 	if (!GameArg.CtlNoMouse)
 		d_mouse_init();
diff --git a/main/menu.c b/main/menu.c
index 16a348e29..fd6313d87 100644
--- a/main/menu.c
+++ b/main/menu.c
@@ -179,7 +179,7 @@ void autodemo_menu_check(int nitems, newmenu_item * items, int *last_key, int ci
 			n_demos = newdemo_count_demos();
 
 try_again:;
-			if ((d_rand() % (n_demos+1)) == 0)
+			if (((d_rand() % (n_demos+1)) == 0) && !GameArg.SysAutoDemo)
 			{
 				#ifndef SHAREWARE
 #ifdef OGL
diff --git a/misc/args.c b/misc/args.c
index 080830e70..8649b5ef9 100644
--- a/misc/args.c
+++ b/misc/args.c
@@ -186,6 +186,11 @@ void ReadCmdArgs(void)
 	else
 		GameArg.SysPilot = NULL;
 
+	if (FindArg("-autodemo"))
+		GameArg.SysAutoDemo = 1;
+	else
+		GameArg.SysAutoDemo = 0;
+
 	if (FindArg("-window"))
 		GameArg.SysWindow = 1;
 	else