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

Load the main menu without loading mixes or creating a shellmap world. A giant hack.

Browse Source
This commit is contained in:
Paul Chote
2011-01-19 22:25:04 +13:00
parent 8d2a78abc6
commit 6776d6f906
7 changed files with 148 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Graphics/HardwarePalette.cs
View File

@@ -17,7 +17,7 @@ using OpenRA.Traits;
namespace OpenRA.Graphics
{
class HardwarePalette
public class HardwarePalette
{
public const int MaxPalettes = 64;
int allocated = 0;
@@ -26,7 +26,7 @@ namespace OpenRA.Graphics
Dictionary<string, Palette> palettes;
Dictionary<string, int> indices;
public HardwarePalette(Map map)
public HardwarePalette()
{
palettes = new Dictionary<string, Palette>();
indices = new Dictionary<string, int>();

6
OpenRA.Game/Graphics/SpriteLoader.cs
View File

@@ -15,10 +15,10 @@ namespace OpenRA.Graphics
{
public class SpriteLoader
{
public SpriteLoader( TileSet tileset, SheetBuilder sheetBuilder )
public SpriteLoader( string[] exts, SheetBuilder sheetBuilder )
{
exts = tileset.Extensions;
SheetBuilder = sheetBuilder;
SheetBuilder = sheetBuilder;
this.exts = exts;
sprites = new Cache<string, Sprite[]>( LoadSprites );
}

5
OpenRA.Game/Graphics/Viewport.cs
View File

@@ -84,11 +84,12 @@ namespace OpenRA.Graphics
public void DrawRegions( WorldRenderer wr, IInputHandler inputHandler )
{
renderer.BeginFrame(scrollPosition);
if (wr != null)
wr.Draw();
wr.Draw();
Widget.DoDraw();
var cursorName = Widget.RootWidget.GetCursorOuter(Viewport.LastMousePos) ?? "default";
new Cursor(cursorName).Draw(wr, (int)cursorFrame, Viewport.LastMousePos + Location);
new Cursor(cursorName).Draw((int)cursorFrame, Viewport.LastMousePos + Location);
renderer.EndFrame( inputHandler );
}

2
OpenRA.Game/Graphics/WorldRenderer.cs
View File

@@ -33,7 +33,7 @@ namespace OpenRA.Graphics
terrainRenderer = new TerrainRenderer(world, this);
shroudRenderer = new ShroudRenderer(world);
uiOverlay = new UiOverlay();
palette = new HardwarePalette(world.Map);
this.palette = Game.modData.Palette;
foreach( var pal in world.traitDict.ActorsWithTraitMultiple<IPalette>( world ) )
pal.Trait.InitPalette( this );