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

fix conflicts

Browse Source
This commit is contained in:
Alli
2010-02-18 13:49:30 +13:00
parent ec1f97364c a6d36fcb9a
commit 3e3276682c
16 changed files with 482 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

197
OpenRa.Game/MainWindow.cs
View File

@@ -29,128 +29,129 @@ using OpenRa.Graphics;
namespace OpenRa
{
class MainWindow : Form
{
readonly Renderer renderer;
//class MainWindow : Form
//{
// readonly Renderer renderer;
static Size GetResolution(Settings settings)
{
var desktopResolution = Screen.PrimaryScreen.Bounds.Size;
if (Game.Settings.Width > 0 && Game.Settings.Height > 0)
{
desktopResolution.Width = Game.Settings.Width;
desktopResolution.Height = Game.Settings.Height;
}
return new Size(
desktopResolution.Width,
desktopResolution.Height);
}
// static Size GetResolution(Settings settings)
// {
// var desktopResolution = Screen.PrimaryScreen.Bounds.Size;
// if (Game.Settings.Width > 0 && Game.Settings.Height > 0)
// {
// desktopResolution.Width = Game.Settings.Width;
// desktopResolution.Height = Game.Settings.Height;
// }
// return new Size(
// desktopResolution.Width,
// desktopResolution.Height);
// }
[DllImport("user32")]
static extern int ShowCursor([MarshalAs(UnmanagedType.Bool)] bool visible);
// [DllImport("user32")]
// static extern int ShowCursor([MarshalAs(UnmanagedType.Bool)] bool visible);
public MainWindow(Settings settings)
{
//Icon = Resources1.OpenRA;
FormBorderStyle = FormBorderStyle.None;
BackColor = Color.Black;
StartPosition = FormStartPosition.Manual;
Location = Point.Empty;
Visible = true;
// public MainWindow(Settings settings)
// {
// Icon = Resources1.OpenRA;
// FormBorderStyle = FormBorderStyle.None;
// BackColor = Color.Black;
// StartPosition = FormStartPosition.Manual;
// Location = Point.Empty;
// Visible = true;
>>>>>>> origin/glfw:OpenRa.Game/MainWindow.cs
while (!File.Exists("redalert.mix"))
{
var current = Directory.GetCurrentDirectory();
if (Directory.GetDirectoryRoot(current) == current)
throw new InvalidOperationException("Unable to load MIX files.");
Directory.SetCurrentDirectory("..");
}
// while (!File.Exists("redalert.mix"))
// {
// var current = Directory.GetCurrentDirectory();
// if (Directory.GetDirectoryRoot(current) == current)
// throw new InvalidOperationException("Unable to load MIX files.");
// Directory.SetCurrentDirectory("..");
// }
LoadUserSettings(settings);
Game.LobbyInfo.GlobalSettings.Mods = Game.Settings.InitialMods;
// LoadUserSettings(settings);
// Game.LobbyInfo.GlobalSettings.Mods = Game.Settings.InitialMods;
// Load the default mod to access required files
Game.LoadModPackages(new Manifest(Game.LobbyInfo.GlobalSettings.Mods));
// // Load the default mod to access required files
// Game.LoadModPackages(new Manifest(Game.LobbyInfo.GlobalSettings.Mods));
UiOverlay.ShowUnitDebug = Game.Settings.UnitDebug;
WorldRenderer.ShowUnitPaths = Game.Settings.PathDebug;
Renderer.SheetSize = Game.Settings.SheetSize;
// UiOverlay.ShowUnitDebug = Game.Settings.UnitDebug;
// WorldRenderer.ShowUnitPaths = Game.Settings.PathDebug;
// Renderer.SheetSize = Game.Settings.SheetSize;
bool windowed = !Game.Settings.Fullscreen;
renderer = new Renderer(this, GetResolution(settings), windowed);
// bool windowed = !Game.Settings.Fullscreen;
// renderer = new Renderer(this, GetResolution(settings), windowed);
var controller = new Controller(() => (Modifiers)(int)ModifierKeys); /* a bit of insane input routing */
// var controller = new Controller(() => (Modifiers)(int)ModifierKeys); /* a bit of insane input routing */
Game.Initialize(Game.Settings.Map, renderer, new int2(ClientSize), Game.Settings.Player, controller);
// Game.Initialize(Game.Settings.Map, renderer, new int2(ClientSize), Game.Settings.Player, controller);
ShowCursor(false);
Game.ResetTimer();
}
// ShowCursor(false);
// Game.ResetTimer();
// }
static void LoadUserSettings(Settings settings)
{
Game.Settings = new UserSettings();
var settingsFile = settings.GetValue("settings", "settings.ini");
FileSystem.Mount("./");
if (FileSystem.Exists(settingsFile))
FieldLoader.Load(Game.Settings,
new IniFile(FileSystem.Open(settingsFile)).GetSection("Settings"));
FileSystem.UnmountAll();
}
// static void LoadUserSettings(Settings settings)
// {
// Game.Settings = new UserSettings();
// var settingsFile = settings.GetValue("settings", "settings.ini");
// FileSystem.Mount("./");
// if (FileSystem.Exists(settingsFile))
// FieldLoader.Load(Game.Settings,
// new IniFile(FileSystem.Open(settingsFile)).GetSection("Settings"));
// FileSystem.UnmountAll();
// }
internal void Run()
{
while (Created && Visible)
{
Game.Tick();
Application.DoEvents();
}
}
// internal void Run()
// {
// while (Created && Visible)
// {
// Game.Tick();
// Application.DoEvents();
// }
// }
int2 lastPos;
// int2 lastPos;
protected override void OnMouseDown(MouseEventArgs e)
{
base.OnMouseDown(e);
lastPos = new int2(e.Location);
Game.DispatchMouseInput(MouseInputEvent.Down, e, ModifierKeys);
}
// protected override void OnMouseDown(MouseEventArgs e)
// {
// base.OnMouseDown(e);
// lastPos = new int2(e.Location);
// Game.DispatchMouseInput(MouseInputEvent.Down, e, ModifierKeys);
// }
protected override void OnMouseMove(MouseEventArgs e)
{
base.OnMouseMove(e);
// protected override void OnMouseMove(MouseEventArgs e)
// {
// base.OnMouseMove(e);
if (e.Button == MouseButtons.Middle || e.Button == (MouseButtons.Left | MouseButtons.Right))
{
int2 p = new int2(e.Location);
Game.viewport.Scroll(lastPos - p);
lastPos = p;
}
// if (e.Button == MouseButtons.Middle || e.Button == (MouseButtons.Left | MouseButtons.Right))
// {
// int2 p = new int2(e.Location);
// Game.viewport.Scroll(lastPos - p);
// lastPos = p;
// }
Game.DispatchMouseInput(MouseInputEvent.Move, e, ModifierKeys);
}
// Game.DispatchMouseInput(MouseInputEvent.Move, e, ModifierKeys);
// }
protected override void OnMouseUp(MouseEventArgs e)
{
base.OnMouseUp(e);
Game.DispatchMouseInput(MouseInputEvent.Up, e, ModifierKeys);
}
// protected override void OnMouseUp(MouseEventArgs e)
// {
// base.OnMouseUp(e);
// Game.DispatchMouseInput(MouseInputEvent.Up, e, ModifierKeys);
// }
protected override void OnKeyDown(KeyEventArgs e)
{
base.OnKeyDown(e);
// protected override void OnKeyDown(KeyEventArgs e)
// {
// base.OnKeyDown(e);
Game.HandleKeyDown( e );
}
// Game.HandleKeyDown( e );
// }
protected override void OnKeyPress(KeyPressEventArgs e)
{
base.OnKeyPress(e);
// protected override void OnKeyPress(KeyPressEventArgs e)
// {
// base.OnKeyPress(e);
Game.HandleKeyPress( e );
}
}
// Game.HandleKeyPress( e );
// }
//}
[Flags]
public enum MouseButton