Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

# Switch to new simulation system by default

Browse Source 
This was SVN commit r7401.
This commit is contained in:
Ykkrosh 2010-03-26 16:10:42 +00:00
parent f0c633785a
commit 89cce1b3ac
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
binaries/data/mods/public/gui/session_new/session.js
View File

@ -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

6
source/main.cpp
View File

@ -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);

2
source/simulation2/Simulation2.cpp
View File

@ -31,7 +31,7 @@
#include "ps/CLogger.h"
#include "ps/Filesystem.h"
bool g_UseSimulation2 = false;
bool g_UseSimulation2 = true;
class CSimulation2Impl
{

2
source/tools/atlas/GameInterface/View.cpp
View File

@ -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)