epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename some settings

Browse Source
This commit is contained in:
Paul Chote
2010-08-24 19:45:36 +12:00
parent 1143f496db
commit c3b3947b9d
14 changed files with 66 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Game/Game.cs
View File

@@ -115,11 +115,11 @@ namespace OpenRA
int t = Environment.TickCount;
int dt = t - lastTime;
if (dt >= Settings.General.Timestep)
if (dt >= Settings.Game.Timestep)
{
using (new PerfSample("tick_time"))
{
lastTime += Settings.General.Timestep;
lastTime += Settings.Game.Timestep;
Widget.DoTick(world);
orderManager.TickImmediate(world);
@@ -254,19 +254,19 @@ namespace OpenRA
+ Path.DirectorySeparatorChar + "OpenRA";
SupportDir = args.GetValue("SupportDir", defaultSupport);
Settings = new Settings(args);
Settings = new Settings(SupportDir + "settings.yaml", args);
Log.LogPath = SupportDir + "Logs" + Path.DirectorySeparatorChar;
Log.AddChannel("perf", "perf.log");
Log.AddChannel("debug", "debug.log");
Log.AddChannel("sync", "syncreport.log");
LobbyInfo.GlobalSettings.Mods = Settings.General.InitialMods;
LobbyInfo.GlobalSettings.Mods = Settings.Game.Mods;
modData = new ModData( LobbyInfo.GlobalSettings.Mods );
Renderer.SheetSize = Settings.General.SheetSize;
Renderer.SheetSize = Settings.Game.SheetSize;
Renderer.Initialize( Game.Settings.Graphics.WindowMode );
Renderer.Initialize( Game.Settings.Graphics.Mode );
Sound.Initialize();
PerfHistory.items["render"].hasNormalTick = false;
@@ -307,7 +307,7 @@ namespace OpenRA
orderManager.Dispose();
var shellmap = modData.Manifest.ShellmapUid;
LobbyInfo = new Session();
LobbyInfo.GlobalSettings.Mods = Settings.General.InitialMods;
LobbyInfo.GlobalSettings.Mods = Settings.Game.Mods;
JoinLocal();
StartGame(shellmap);