From 62dee51b72400b15ae588d6b24448f8478c588b0 Mon Sep 17 00:00:00 2001 From: avolkov Date: Sat, 16 Jul 2011 19:56:22 +0000 Subject: [PATCH] Removed the remnants of the --music option; bug #1133 git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3650 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/ChangeLog | 1 + sc2/doc/users/manual.txt | 9 --------- sc2/src/uqm.c | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/sc2/ChangeLog b/sc2/ChangeLog index 843620781..b9cb1f4af 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,5 @@ Changes towards version 0.8: +- Removed the remnants of the --music option (bug #1133) - Alex - Fixed flagship re-entering the inner system after an encounter in the outer system, thus trapping the player (bug #1135) - Alex - Fixed starmap fuel range circle shrinking (bug #1130) - Alex diff --git a/sc2/doc/users/manual.txt b/sc2/doc/users/manual.txt index e60a8ada3..6f7bf9802 100644 --- a/sc2/doc/users/manual.txt +++ b/sc2/doc/users/manual.txt @@ -134,15 +134,6 @@ Set sound effects volume (0-100). Set speech volume (0-100). If set to 0, the game runs in 'no speech' mode and the oscilloscope reacts to the music. - -m 3do (or --music 3do) - -Use the 3DO remixed soundtrack for songs that were in fact remixed. -The default. - - -m pc (or --music pc) - -Use the .MOD based PC soundtrack everywhere. - -q (or --audioquality) Can be "high", "medium", or "low". Specifies how nice the audio diff --git a/sc2/src/uqm.c b/sc2/src/uqm.c index 26d572866..4e2b204b9 100644 --- a/sc2/src/uqm.c +++ b/sc2/src/uqm.c @@ -707,7 +707,7 @@ enum #endif }; -static const char *optString = "+r:foc:b:spC:n:?hM:S:T:m:q:ug:l:i:vwxk"; +static const char *optString = "+r:foc:b:spC:n:?hM:S:T:q:ug:l:i:vwxk"; static struct option longOptions[] = { {"res", 1, NULL, 'r'},