move some more (gameplay related) widgets into mods/

This commit is contained in:
Bob
2010-07-30 20:23:16 +12:00
parent b4c84a11f2
commit ede160f1b6
18 changed files with 45 additions and 39 deletions

View File

@@ -17,7 +17,7 @@ using OpenRA.Traits;
namespace OpenRA.Graphics namespace OpenRA.Graphics
{ {
class Minimap public class Minimap
{ {
public static Bitmap TerrainBitmap(Map map) public static Bitmap TerrainBitmap(Map map)
{ {

View File

@@ -20,7 +20,7 @@ namespace OpenRA.Graphics
ITexture texture; ITexture texture;
bool dirty; bool dirty;
internal Sheet(Size size) public Sheet(Size size)
{ {
this.bitmap = new Bitmap(size.Width, size.Height); this.bitmap = new Bitmap(size.Width, size.Height);
} }

View File

@@ -22,7 +22,7 @@ namespace OpenRA.Graphics
readonly float2[] uvhax; readonly float2[] uvhax;
internal Sprite(Sheet sheet, Rectangle bounds, TextureChannel channel) public Sprite(Sheet sheet, Rectangle bounds, TextureChannel channel)
{ {
this.bounds = bounds; this.bounds = bounds;
this.sheet = sheet; this.sheet = sheet;

View File

@@ -90,10 +90,8 @@
<Compile Include="Widgets\Delegates\CreateServerMenuDelegate.cs" /> <Compile Include="Widgets\Delegates\CreateServerMenuDelegate.cs" />
<Compile Include="Widgets\Delegates\DiplomacyDelegate.cs" /> <Compile Include="Widgets\Delegates\DiplomacyDelegate.cs" />
<Compile Include="Widgets\Delegates\MainMenuButtonsDelegate.cs" /> <Compile Include="Widgets\Delegates\MainMenuButtonsDelegate.cs" />
<Compile Include="Widgets\RadarBinWidget.cs" />
<Compile Include="Widgets\Delegates\ServerBrowserDelegate.cs" /> <Compile Include="Widgets\Delegates\ServerBrowserDelegate.cs" />
<Compile Include="Widgets\Delegates\SettingsMenuDelegate.cs" /> <Compile Include="Widgets\Delegates\SettingsMenuDelegate.cs" />
<Compile Include="Widgets\MoneyBinWidget.cs" />
<Compile Include="Widgets\MapPreviewWidget.cs" /> <Compile Include="Widgets\MapPreviewWidget.cs" />
<Compile Include="Widgets\WidgetUtils.cs" /> <Compile Include="Widgets\WidgetUtils.cs" />
<Compile Include="Effects\DelayedAction.cs" /> <Compile Include="Effects\DelayedAction.cs" />
@@ -200,15 +198,12 @@
<Compile Include="Widgets\CheckboxWidget.cs" /> <Compile Include="Widgets\CheckboxWidget.cs" />
<Compile Include="Traits\World\BibLayer.cs" /> <Compile Include="Traits\World\BibLayer.cs" />
<Compile Include="Traits\World\SmudgeLayer.cs" /> <Compile Include="Traits\World\SmudgeLayer.cs" />
<Compile Include="Widgets\Delegates\IngameChromeDelegate.cs" />
<Compile Include="Widgets\SpecialPowerBinWidget.cs" />
<Compile Include="Widgets\Delegates\MusicPlayerDelegate.cs" /> <Compile Include="Widgets\Delegates\MusicPlayerDelegate.cs" />
<Compile Include="Widgets\PerfGraphWidget.cs" /> <Compile Include="Widgets\PerfGraphWidget.cs" />
<Compile Include="Widgets\Delegates\PerfDebugDelegate.cs" /> <Compile Include="Widgets\Delegates\PerfDebugDelegate.cs" />
<Compile Include="Widgets\Delegates\LobbyDelegate.cs" /> <Compile Include="Widgets\Delegates\LobbyDelegate.cs" />
<Compile Include="Widgets\ColorBlockWidget.cs" /> <Compile Include="Widgets\ColorBlockWidget.cs" />
<Compile Include="GameRules\MusicInfo.cs" /> <Compile Include="GameRules\MusicInfo.cs" />
<Compile Include="Widgets\PowerBinWidget.cs" />
<Compile Include="Widgets\ImageWidget.cs" /> <Compile Include="Widgets\ImageWidget.cs" />
<Compile Include="Traits\SharesCell.cs" /> <Compile Include="Traits\SharesCell.cs" />
<Compile Include="Traits\World\AircraftInfluence.cs" /> <Compile Include="Traits\World\AircraftInfluence.cs" />
@@ -219,7 +214,6 @@
<Compile Include="Widgets\SliderWidget.cs" /> <Compile Include="Widgets\SliderWidget.cs" />
<Compile Include="Widgets\TimerWidget.cs" /> <Compile Include="Widgets\TimerWidget.cs" />
<Compile Include="Widgets\ShpImageWidget.cs" /> <Compile Include="Widgets\ShpImageWidget.cs" />
<Compile Include="Widgets\OrderButtonWidget.cs" />
<Compile Include="Traits\DrawLineToTarget.cs" /> <Compile Include="Traits\DrawLineToTarget.cs" />
<Compile Include="Widgets\WorldInteractionControllerWidget.cs" /> <Compile Include="Widgets\WorldInteractionControllerWidget.cs" />
<Compile Include="Widgets\ViewportScrollControllerWidget.cs" /> <Compile Include="Widgets\ViewportScrollControllerWidget.cs" />

View File

@@ -12,9 +12,9 @@ using System.Linq;
namespace OpenRA.Traits namespace OpenRA.Traits
{ {
class ProvidesRadarInfo : TraitInfo<ProvidesRadar> { } public class ProvidesRadarInfo : TraitInfo<ProvidesRadar> { }
class ProvidesRadar : ITick public class ProvidesRadar : ITick
{ {
public bool IsActive { get; private set; } public bool IsActive { get; private set; }

View File

@@ -14,7 +14,7 @@ using System.Linq;
namespace OpenRA.Widgets namespace OpenRA.Widgets
{ {
class ChatDisplayWidget : Widget public class ChatDisplayWidget : Widget
{ {
public readonly int RemoveTime = 0; public readonly int RemoveTime = 0;
@@ -23,7 +23,7 @@ namespace OpenRA.Widgets
public bool DrawBackground = true; public bool DrawBackground = true;
int ticksUntilRemove = 0; int ticksUntilRemove = 0;
public List<ChatLine> recentLines = new List<ChatLine>(); internal List<ChatLine> recentLines = new List<ChatLine>();
public ChatDisplayWidget() public ChatDisplayWidget()
: base() { } : base() { }

View File

@@ -13,7 +13,7 @@ using System.Drawing;
namespace OpenRA.Widgets namespace OpenRA.Widgets
{ {
class LabelWidget : Widget public class LabelWidget : Widget
{ {
public enum TextAlign { Left, Center, Right } public enum TextAlign { Left, Center, Right }

View File

@@ -201,6 +201,12 @@
<Compile Include="Wall.cs" /> <Compile Include="Wall.cs" />
<Compile Include="WaterPaletteRotation.cs" /> <Compile Include="WaterPaletteRotation.cs" />
<Compile Include="Widgets\BuildPaletteWidget.cs" /> <Compile Include="Widgets\BuildPaletteWidget.cs" />
<Compile Include="Widgets\Delegates\IngameChromeDelegate.cs" />
<Compile Include="Widgets\MoneyBinWidget.cs" />
<Compile Include="Widgets\OrderButtonWidget.cs" />
<Compile Include="Widgets\PowerBinWidget.cs" />
<Compile Include="Widgets\RadarBinWidget.cs" />
<Compile Include="Widgets\SpecialPowerBinWidget.cs" />
<Compile Include="WithMuzzleFlash.cs" /> <Compile Include="WithMuzzleFlash.cs" />
<Compile Include="WithShadow.cs" /> <Compile Include="WithShadow.cs" />
<Compile Include="NukePaletteEffect.cs" /> <Compile Include="NukePaletteEffect.cs" />

View File

@@ -8,12 +8,10 @@
*/ */
#endregion #endregion
using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Linq; using OpenRA.Traits;
using OpenRA.FileFormats;
namespace OpenRA.Traits namespace OpenRA.Mods.RA
{ {
public class RadarColorFromTerrainInfo : ITraitInfo public class RadarColorFromTerrainInfo : ITraitInfo
{ {

View File

@@ -16,8 +16,9 @@ using OpenRA.FileFormats;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Orders; using OpenRA.Orders;
using OpenRA.Traits; using OpenRA.Traits;
using OpenRA.Widgets;
namespace OpenRA.Widgets namespace OpenRA.Mods.RA.Widgets
{ {
class BuildPaletteWidget : Widget class BuildPaletteWidget : Widget
{ {

View File

@@ -9,8 +9,9 @@
#endregion #endregion
using OpenRA.Traits; using OpenRA.Traits;
using System.Linq; using OpenRA.Widgets;
namespace OpenRA.Widgets.Delegates
namespace OpenRA.Mods.RA.Widgets.Delegates
{ {
public class IngameChromeDelegate : IWidgetDelegate public class IngameChromeDelegate : IWidgetDelegate
{ {

View File

@@ -1,4 +1,3 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2010 The OpenRA Developers (see AUTHORS) * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
@@ -9,8 +8,8 @@
*/ */
#endregion #endregion
using OpenRA.Widgets;
using OpenRA.Mods.RA.Orders; using OpenRA.Mods.RA.Orders;
using OpenRA.Widgets;
namespace OpenRA.Mods.RA.Widgets.Delegates namespace OpenRA.Mods.RA.Widgets.Delegates
{ {

View File

@@ -15,8 +15,9 @@ using System.Linq;
using OpenRA.FileFormats; using OpenRA.FileFormats;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Traits; using OpenRA.Traits;
using OpenRA.Widgets;
namespace OpenRA.Widgets namespace OpenRA.Mods.RA.Widgets
{ {
class MoneyBinWidget : Widget class MoneyBinWidget : Widget
{ {

View File

@@ -1,7 +1,9 @@
using System; using System;
using OpenRA.Graphics;
using System.Drawing; using System.Drawing;
namespace OpenRA.Widgets using OpenRA.Graphics;
using OpenRA.Widgets;
namespace OpenRA.Mods.RA.Widgets
{ {
public class OrderButtonWidget : ButtonWidget public class OrderButtonWidget : ButtonWidget
{ {

View File

@@ -12,8 +12,9 @@ using System;
using System.Drawing; using System.Drawing;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Traits; using OpenRA.Traits;
using OpenRA.Widgets;
namespace OpenRA.Widgets namespace OpenRA.Mods.RA.Widgets
{ {
public class PowerBinWidget : Widget public class PowerBinWidget : Widget
{ {

View File

@@ -12,8 +12,9 @@ using System.Drawing;
using System.Linq; using System.Linq;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Traits; using OpenRA.Traits;
using OpenRA.Widgets;
namespace OpenRA.Widgets namespace OpenRA.Mods.RA.Widgets
{ {
public class RadarBinWidget : Widget public class RadarBinWidget : Widget
{ {

View File

@@ -15,8 +15,9 @@ using System.Linq;
using OpenRA.FileFormats; using OpenRA.FileFormats;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Traits; using OpenRA.Traits;
using OpenRA.Widgets;
namespace OpenRA.Widgets namespace OpenRA.Mods.RA.Widgets
{ {
class SpecialPowerBinWidget : Widget class SpecialPowerBinWidget : Widget
{ {

View File

@@ -9,9 +9,10 @@
#endregion #endregion
using System.Linq; using System.Linq;
using OpenRA.Traits;
using OpenRA.Widgets; using OpenRA.Widgets;
namespace OpenRA.Traits namespace OpenRA.Mods.RA.Widgets
{ {
class ChoosePaletteOnSelectInfo : TraitInfo<ChoosePaletteOnSelect> { } class ChoosePaletteOnSelectInfo : TraitInfo<ChoosePaletteOnSelect> { }