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

Set the viewport on world load

Browse Source
This commit is contained in:
Paul Chote
2010-04-09 23:41:43 +12:00
committed by Chris Forbes
parent 803076caf9
commit 0047b961b3
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Game/Game.cs
View File

@@ -153,14 +153,20 @@ namespace OpenRA
var manifest = new Manifest(LobbyInfo.GlobalSettings.Mods); var manifest = new Manifest(LobbyInfo.GlobalSettings.Mods);
Timer.Time( "manifest: {0}" ); Timer.Time( "manifest: {0}" );
if (!Game.AvailableMaps.ContainsKey(mapName))
throw new InvalidDataException("Cannot find map with Uid {0}".F(mapName));
var map = new Map( Game.AvailableMaps[mapName].Package );
viewport = new Viewport(clientSize, map.TopLeft, map.BottomRight, renderer);
world = null; // trying to access the old world will NRE, rather than silently doing it wrong. world = null; // trying to access the old world will NRE, rather than silently doing it wrong.
ChromeProvider.Initialize(manifest.Chrome); ChromeProvider.Initialize(manifest.Chrome);
world = new World(manifest,mapName); Timer.Time( "viewport, ChromeProvider: {0}" );
world = new World(manifest,map);
Timer.Time( "world: {0}" ); Timer.Time( "world: {0}" );
SequenceProvider.Initialize(manifest.Sequences); SequenceProvider.Initialize(manifest.Sequences);
viewport = new Viewport(clientSize, Game.world.Map.TopLeft, Game.world.Map.BottomRight, renderer); Timer.Time( "ChromeProv, SeqProv: {0}" );
Timer.Time( "ChromeProv, SeqProv, viewport: {0}" );
chrome = new Chrome(renderer, manifest); chrome = new Chrome(renderer, manifest);
Timer.Time( "chrome: {0}" ); Timer.Time( "chrome: {0}" );

9
OpenRA.Game/World.cs
View File

@@ -75,16 +75,11 @@ namespace OpenRA
public readonly WorldRenderer WorldRenderer; public readonly WorldRenderer WorldRenderer;
internal readonly Minimap Minimap; internal readonly Minimap Minimap;
public World(Manifest manifest, string mapUid) public World(Manifest manifest, Map map)
{ {
Timer.Time( "----World.ctor" ); Timer.Time( "----World.ctor" );
Map = map;
if (!Game.AvailableMaps.ContainsKey(mapUid))
throw new InvalidDataException("Cannot find map with Uid {0}".F(mapUid));
Map = new Map( Game.AvailableMaps[mapUid].Package );
customTerrain = new ICustomTerrain[Map.MapSize.X, Map.MapSize.Y]; customTerrain = new ICustomTerrain[Map.MapSize.X, Map.MapSize.Y];
Timer.Time( "new Map: {0}" ); Timer.Time( "new Map: {0}" );

11
OpenRA.Mods.RA/DefaultShellmapScript.cs
View File

@@ -29,16 +29,19 @@ namespace OpenRA.Mods.RA
public object Create(Actor self) { return new DefaultShellmapScript(); } public object Create(Actor self) { return new DefaultShellmapScript(); }
} }
class DefaultShellmapScript : ITick class DefaultShellmapScript : ITick, ILoadWorldHook
{ {
public void WorldLoaded(World w)
{
// Set the viewport location
Game.MoveViewport(new int2(85,65));
}
// Rude hack around the multiple-creation bug: // Rude hack around the multiple-creation bug:
// wait long enough for the transient copies to die before starting // wait long enough for the transient copies to die before starting
int initialDelay = 20; int initialDelay = 20;
public void Tick(Actor self) public void Tick(Actor self)
{ {
// Another rude hack
Game.MoveViewport(new int2(85,65));
if (initialDelay > 0 && --initialDelay == 0) if (initialDelay > 0 && --initialDelay == 0)
Sound.PlayMusic("hell226m.aud"); Sound.PlayMusic("hell226m.aud");
} }