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

#85 fixed

Browse Source
This commit is contained in:
Chris Forbes
2009-11-09 21:32:28 +13:00
parent 49f48bef6a
commit 6e4a53d49a
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRa.Game/Graphics/Viewport.cs
View File

@@ -51,7 +51,9 @@ namespace OpenRa.Game.Graphics
foreach (Region region in regions) foreach (Region region in regions)
region.Draw(renderer); region.Draw(renderer);
cursorRenderer.DrawSprite(cursor.GetSprite((int)cursorFrame), mousePos + Location - cursor.GetHotspot(), 0);
var c = (Game.worldRenderer.region.Contains(mousePos)) ? cursor : Cursor.Default;
cursorRenderer.DrawSprite(c.GetSprite((int)cursorFrame), mousePos + Location - c.GetHotspot(), 0);
cursorRenderer.Flush(); cursorRenderer.Flush();
renderer.EndFrame(); renderer.EndFrame();

10
OpenRa.Game/MainWindow.cs
View File

@@ -6,9 +6,6 @@ using System.Runtime.InteropServices;
namespace OpenRa.Game namespace OpenRa.Game
{ {
using GRegion = OpenRa.Game.Graphics.Region;
class MainWindow : Form class MainWindow : Form
{ {
readonly Renderer renderer; readonly Renderer renderer;
@@ -17,9 +14,10 @@ namespace OpenRa.Game
static Size GetResolution(Settings settings) static Size GetResolution(Settings settings)
{ {
Size desktopResolution = Screen.PrimaryScreen.Bounds.Size; var desktopResolution = Screen.PrimaryScreen.Bounds.Size;
return new Size(settings.GetValue("width", desktopResolution.Width), return new Size(
settings.GetValue("width", desktopResolution.Width),
settings.GetValue("height", desktopResolution.Height)); settings.GetValue("height", desktopResolution.Height));
} }
@@ -51,8 +49,8 @@ namespace OpenRa.Game
UiOverlay.ShowUnitDebug = settings.GetValue("udebug", false); UiOverlay.ShowUnitDebug = settings.GetValue("udebug", false);
UiOverlay.ShowBuildDebug = settings.GetValue("bdebug", false); UiOverlay.ShowBuildDebug = settings.GetValue("bdebug", false);
Game.timestep = settings.GetValue("rate", 40);
WorldRenderer.ShowUnitPaths = settings.GetValue("pathdebug", false); WorldRenderer.ShowUnitPaths = settings.GetValue("pathdebug", false);
Game.timestep = settings.GetValue("rate", 40);
Game.Replay = settings.GetValue("replay", ""); Game.Replay = settings.GetValue("replay", "");
Game.Initialize(settings.GetValue("map", "scm12ea.ini"), renderer, new int2(ClientSize), Game.Initialize(settings.GetValue("map", "scm12ea.ini"), renderer, new int2(ClientSize),