From 4307e18e714b42f45e28aaa260b891bd12c9c35b Mon Sep 17 00:00:00 2001
From: "Jake.Stine" <Jake.Stine@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Tue, 1 Sep 2009 09:34:51 +0000
Subject: [PATCH] Command line fixes (Issue 331):  * I had incorrectly
 documented -usecd as -usecdvd (oops)  * Skipbios now defaults to OFF is was
 intended

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1723 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 pcsx2/windows/VCprojects/pcsx2_2008.vcproj | 2 --
 pcsx2/windows/WinMain.cpp                  | 2 +-
 pcsx2/windows/WinSysExec.cpp               | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pcsx2/windows/VCprojects/pcsx2_2008.vcproj b/pcsx2/windows/VCprojects/pcsx2_2008.vcproj
index 5b7be171f7..9853e4755c 100644
--- a/pcsx2/windows/VCprojects/pcsx2_2008.vcproj
+++ b/pcsx2/windows/VCprojects/pcsx2_2008.vcproj
@@ -97,7 +97,6 @@
 		</Configuration>
 		<Configuration
 			Name="Devel|Win32"
-			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets=".\vsprops\common.vsprops;..\..\..\common\vsprops\BaseProperties.vsprops;..\..\..\common\vsprops\3rdpartyDeps.vsprops;.\vsprops\devbuild.vsprops;..\..\..\common\vsprops\pthreads.vsprops;..\..\..\common\vsprops\CodeGen_Devel.vsprops;..\..\..\common\vsprops\IncrementalLinking.vsprops"
 			UseOfMFC="0"
@@ -178,7 +177,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets=".\vsprops\common.vsprops;..\..\..\common\vsprops\BaseProperties.vsprops;..\..\..\common\vsprops\3rdpartyDeps.vsprops;..\..\..\common\vsprops\pthreads.vsprops;..\..\..\common\vsprops\CodeGen_Release.vsprops"
 			UseOfMFC="0"
diff --git a/pcsx2/windows/WinMain.cpp b/pcsx2/windows/WinMain.cpp
index 6eba335452..201174ff0f 100644
--- a/pcsx2/windows/WinMain.cpp
+++ b/pcsx2/windows/WinMain.cpp
@@ -74,7 +74,7 @@ static const char* phelpmsg =
 	"\t-skipbios   {emulator will skip standard BIOS splash screens; does not apply to ELF}\n"
 	"\t-elf [file] {executes an ELF image}\n"
 	"\t-nodisc     {use this to boot into the PS2 system menu}\n"
-	"\t-usecdvd    {auto-boots from the configured CDVD plugin (ignores cdimage parameter)}\n"
+	"\t-usecd      {auto-boots from the configured CDVD plugin (ignores cdimage parameter)}\n"
 
 	"\n\n"
 
diff --git a/pcsx2/windows/WinSysExec.cpp b/pcsx2/windows/WinSysExec.cpp
index 2ec664b52e..5925555f28 100644
--- a/pcsx2/windows/WinSysExec.cpp
+++ b/pcsx2/windows/WinSysExec.cpp
@@ -73,7 +73,7 @@ int ParseCommandLine( int tokenCount, TCHAR *const *const tokens )
 	g_Startup.ElfFile		= NULL;
 
 	g_Startup.StartupMode	= Startup_FromCDVD;
-	g_Startup.SkipBios		= true;
+	g_Startup.SkipBios		= false;
 	g_Startup.CdvdSource	= CDVDsrc_Plugin;
 
 	bool _legacy_ForceElfLoad = false;