From 89cce1b3ac2086d25b57070a483f08ac6dcf63cb Mon Sep 17 00:00:00 2001
From: Ykkrosh <philip@wildfiregames.com>
Date: Fri, 26 Mar 2010 16:10:42 +0000
Subject: [PATCH] # Switch to new simulation system by default

This was SVN commit r7401.
---
 binaries/data/mods/public/gui/session_new/session.js | 11 ++++++-----
 source/main.cpp                                      |  6 +++---
 source/simulation2/Simulation2.cpp                   |  2 +-
 source/tools/atlas/GameInterface/View.cpp            |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/binaries/data/mods/public/gui/session_new/session.js b/binaries/data/mods/public/gui/session_new/session.js
index e1aacd20a4..2a1f771d7a 100644
--- a/binaries/data/mods/public/gui/session_new/session.js
+++ b/binaries/data/mods/public/gui/session_new/session.js
@@ -154,14 +154,15 @@ function updateUnitDisplay()
 
 	if (entState.attack) // TODO - this should be based on some AI properties
 	{
-		usedPanels["Stance"] = 1;
-		usedPanels["Formation"] = 1;
+		//usedPanels["Stance"] = 1;
+		//usedPanels["Formation"] = 1;
+		// (These are disabled since they're not implemented yet)
 	}
 	else // TODO - this should be based on various other things
 	{
-		usedPanels["Queue"] = 1;
-		usedPanels["Training"] = 1;
-		usedPanels["Research"] = 1;
+		//usedPanels["Queue"] = 1;
+		//usedPanels["Training"] = 1;
+		//usedPanels["Research"] = 1;
 	}
 
 	// Set up the unit construction buttons
diff --git a/source/main.cpp b/source/main.cpp
index 97a46bc077..d9c9ac1e5f 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -384,10 +384,10 @@ static void RunGameOrAtlas(int argc, const char* argv[])
 	// might run Atlas.
 	CXeromyces::Startup();
 
-	// allow switching to new simulation system, before any
+	// allow switching to old simulation system, before any
 	// other init code makes use of it
-	if (args.Has("sim2"))
-		g_UseSimulation2 = true;
+	if (args.Has("sim1"))
+		g_UseSimulation2 = false;
 
 	// run Atlas (if requested via args)
 	bool ran_atlas = ATLAS_RunIfOnCmdLine(args);
diff --git a/source/simulation2/Simulation2.cpp b/source/simulation2/Simulation2.cpp
index 9719168b96..5ca997f49e 100644
--- a/source/simulation2/Simulation2.cpp
+++ b/source/simulation2/Simulation2.cpp
@@ -31,7 +31,7 @@
 #include "ps/CLogger.h"
 #include "ps/Filesystem.h"
 
-bool g_UseSimulation2 = false;
+bool g_UseSimulation2 = true;
 
 class CSimulation2Impl
 {
diff --git a/source/tools/atlas/GameInterface/View.cpp b/source/tools/atlas/GameInterface/View.cpp
index 95a1af41b5..f5854d571f 100644
--- a/source/tools/atlas/GameInterface/View.cpp
+++ b/source/tools/atlas/GameInterface/View.cpp
@@ -262,7 +262,7 @@ void ViewGame::RestoreState(const std::wstring& label)
 std::wstring ViewGame::DumpState(bool binary)
 {
 	if (! g_UseSimulation2)
-		return L"The game isn't using the new simulation system - use the -sim2 command-line flag if you want that";
+		return L"The game isn't using the new simulation system";
 
 	std::stringstream stream;
 	if (binary)