Menu
▾
▴
[Cs-sdl-commits] SF.net SVN: cs-sdl: [1397] trunk/scsharp/src/SCSharpLib
|
From: <je...@us...> - 2007-05-24 19:40:29
|
Revision: 1397
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1397&view=rev
Author: jendave
Date: 2007-05-24 12:40:26 -0700 (Thu, 24 May 2007)
Log Message:
-----------
more fxcop fixes
Modified Paths:
--------------
trunk/scsharp/src/SCSharpLib/MpqLib/BinElement.cs
trunk/scsharp/src/SCSharpLib/MpqLib/BitStream.cs
trunk/scsharp/src/SCSharpLib/MpqLib/Got.cs
trunk/scsharp/src/SCSharpLib/MpqLib/Grp.cs
trunk/scsharp/src/SCSharpLib/MpqLib/MpqStream.cs
trunk/scsharp/src/SCSharpLib/MpqLib/SCFont.cs
trunk/scsharp/src/SCSharpLib/Properties/AssemblyInfo.cs
trunk/scsharp/src/SCSharpLib/UI/BuiltIns.cs
trunk/scsharp/src/SCSharpLib/UI/ButtonElement.cs
trunk/scsharp/src/SCSharpLib/UI/ConnectionScreen.cs
trunk/scsharp/src/SCSharpLib/UI/CreditsScreen.cs
trunk/scsharp/src/SCSharpLib/UI/EndMissionDialog.cs
trunk/scsharp/src/SCSharpLib/UI/GameScreen.cs
trunk/scsharp/src/SCSharpLib/UI/GuiUtility.cs
trunk/scsharp/src/SCSharpLib/UI/LoginScreen.cs
trunk/scsharp/src/SCSharpLib/UI/MainMenu.cs
trunk/scsharp/src/SCSharpLib/UI/NetworkDialog.cs
trunk/scsharp/src/SCSharpLib/UI/ObjectivesDialog.cs
trunk/scsharp/src/SCSharpLib/UI/PlayCustomScreen.cs
trunk/scsharp/src/SCSharpLib/UI/QuitMissionDialog.cs
trunk/scsharp/src/SCSharpLib/UI/RaceSelectionScreen.cs
trunk/scsharp/src/SCSharpLib/UI/ReadyRoomScreen.cs
trunk/scsharp/src/SCSharpLib/UI/SoundDialog.cs
trunk/scsharp/src/SCSharpLib/UI/SpeedDialog.cs
trunk/scsharp/src/SCSharpLib/UI/TitleScreen.cs
Modified: trunk/scsharp/src/SCSharpLib/MpqLib/BinElement.cs
===================================================================
--- trunk/scsharp/src/SCSharpLib/MpqLib/BinElement.cs 2007-05-24 19:03:55 UTC (rev 1396)
+++ trunk/scsharp/src/SCSharpLib/MpqLib/BinElement.cs 2007-05-24 19:40:26 UTC (rev 1397)
@@ -378,7 +378,7 @@
{
if (buffer == null)
{
- throw new ArgumentNullException("buf");
+ throw new ArgumentNullException("buffer");
}
x1 = Utilities.ReadWord(buffer, position + 4);
y1 = Utilities.ReadWord(buffer, position + 6);
Modified: trunk/scsharp/src/SCSharpLib/MpqLib/BitStream.cs
===================================================================
--- trunk/scsharp/src/SCSharpLib/MpqLib/BitStream.cs 2007-05-24 19:03:55 UTC (rev 1396)
+++ trunk/scsharp/src/SCSharpLib/MpqLib/BitStream.cs 2007-05-24 19:40:26 UTC (rev 1397)
@@ -72,7 +72,7 @@
{
if (bitCount > 16)
{
- throw new ArgumentOutOfRangeException("BitCount", "Maximum BitCount is 16");
+ throw new ArgumentOutOfRangeException("bitCount", "Maximum BitCount is 16");
}
if (EnsureBits(bitCount) == false)
{
Modified: trunk/scsharp/src/SCSharpLib/MpqLib/Got.cs
===================================================================
--- trunk/scsharp/src/SCSharpLib/MpqLib/Got.cs 2007-05-24 19:03:55 UTC (rev 1396)
+++ trunk/scsharp/src/SCSharpLib/MpqLib/Got.cs 2007-05-24 19:40:26 UTC (rev 1397)
@@ -55,7 +55,7 @@
///0x54 (unsigned short) - Game type's variable (actual setting rather than just the label as in 0x45)
///0x58 (unsigned long) - Starting mineral ammount
/// </summary>
- public enum InitialUnits
+ public enum InitialUnitsSetting
{
/// <summary>
///
@@ -150,9 +150,9 @@
/// <summary>
///
/// </summary>
- public InitialUnits InitialUnits
+ public InitialUnitsSetting InitialUnits
{
- get { return (InitialUnits)contents[0x4d]; }
+ get { return (InitialUnitsSetting)contents[0x4d]; }
}
}
}
Modified: trunk/scsharp/src/SCSharpLib/MpqLib/Grp.cs
===================================================================
--- trunk/scsharp/src/SCSharpLib/MpqLib/Grp.cs 2007-05-24 19:03:55 UTC (rev 1396)
+++ trunk/scsharp/src/SCSharpLib/MpqLib/Grp.cs 2007-05-24 19:40:26 UTC (rev 1397)
@@ -210,7 +210,7 @@
}
catch (IndexOutOfRangeException e)
{
- Console.WriteLine("EXCEPTION on line {0}, x = {2}, i = {3}, line length = {2} (line data length = {4}):", line, x, lineLength, i, line_data.Length);
+ Console.WriteLine("EXCEPTION on line {0}, x = {1}, i = {2}, line length = {3} (line data length = {4}):", line, x, lineLength, i, line_data.Length);
Console.WriteLine(e.StackTrace);
}
}
Modified: trunk/scsharp/src/SCSharpLib/MpqLib/MpqStream.cs
===================================================================
--- trunk/scsharp/src/SCSharpLib/MpqLib/MpqStream.cs 2007-05-24 19:03:55 UTC (rev 1396)
+++ trunk/scsharp/src/SCSharpLib/MpqLib/MpqStream.cs 2007-05-24 19:40:26 UTC (rev 1397)
@@ -223,16 +223,16 @@
target = Length + offset;
break;
default:
- throw new ArgumentNullException("Origin", "Invalid SeekOrigin");
+ throw new ArgumentNullException("origin", "Invalid SeekOrigin");
}
if (target < 0)
{
- throw new ArgumentOutOfRangeException("Attmpted to Seek before the beginning of the stream");
+ throw new ArgumentOutOfRangeException("offset", "Attmpted to Seek before the beginning of the stream");
}
if (target >= Length)
{
- throw new ArgumentOutOfRangeException("Attmpted to Seek beyond the end of the stream");
+ throw new ArgumentOutOfRangeException("offset", "Attmpted to Seek beyond the end of the stream");
}
mPosition = target;
Modified: trunk/scsharp/src/SCSharpLib/MpqLib/SCFont.cs
===================================================================
--- trunk/scsharp/src/SCSharpLib/MpqLib/SCFont.cs 2007-05-24 19:03:55 UTC (rev 1396)
+++ trunk/scsharp/src/SCSharpLib/MpqLib/SCFont.cs 2007-05-24 19:40:26 UTC (rev 1397)
@@ -228,10 +228,10 @@
/// <summary>
///
/// </summary>
- /// <param name="glyphID"></param>
- public void DumpGlyph(int glyphID)
+ /// <param name="glyphId"></param>
+ public void DumpGlyph(int glyphId)
{
- Glyph g = GetGlyph(glyphID);
+ Glyph g = GetGlyph(glyphId);
byte[,] bitmap = g.Bitmap;
for (int y = g.Height - 1; y >= 0; y--)
{
Modified: trunk/scsharp/src/SCSharpLib/Properties/AssemblyInfo.cs
===================================================================
--- trunk/scsharp/src/SCSharpLib/Properties/AssemblyInfo.cs 2007-05-24 19:03:55 UTC (rev 1396)
+++ trunk/scsharp/src/SCSharpLib/Properties/AssemblyInfo.cs 2007-05-24 19:40:26 UTC (rev 1397)
@@ -159,3 +159,43 @@
[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.RestartConfirmationDialog..ctor(SCSharp.UI.UIScreen,SCSharp.MpqLib.Mpq)", MessageId = "1#mpq")]
[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.SpeedDialog..ctor(SCSharp.UI.UIScreen,SCSharp.MpqLib.Mpq)", MessageId = "1#mpq")]
[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.PlayCustomScreen..ctor(SCSharp.MpqLib.Mpq)", MessageId = "0#mpq")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.SpritesTbl", MessageId = "Tbl")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.OrdersTbl", MessageId = "Tbl")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.GluCampaignBin", MessageId = "Glu")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.WeaponsTbl", MessageId = "Tbl")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.GluPEditBin", MessageId = "Glu")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.ScoreDPMainPcx", MessageId = "Pcx")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.GameConsolePcx", MessageId = "Pcx")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.GluLoginBin", MessageId = "Glu")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.GluConnectionBin", MessageId = "Glu")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.GluAllTbl", MessageId = "Tbl")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.GluAllTbl", MessageId = "Glu")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.GluExpCampaignBin", MessageId = "Glu")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.RezCreditListTxt", MessageId = "Rez")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.GluLoadBin", MessageId = "Glu")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.GluScoreBin", MessageId = "Glu")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.GluReadyBin", MessageId = "Glu")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.GluMainBin", MessageId = "Glu")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.HelpTxtTbl", MessageId = "Tbl")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.ImagesTbl", MessageId = "Tbl")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.GluPOkCancelBin", MessageId = "Glu")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.FlingyTbl", MessageId = "Flingy")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.FlingyTbl", MessageId = "Tbl")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.SfxDataDat", MessageId = "Sfx")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.TitlePcx", MessageId = "Pcx")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.GluGameModeBin", MessageId = "Glu")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.GluCreateBin", MessageId = "Glu")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.ScoreVPMainPcx", MessageId = "Pcx")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.MapDataTbl", MessageId = "Tbl")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.UnitsTbl", MessageId = "Tbl")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.GluPOkBin", MessageId = "Glu")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.TechDataTbl", MessageId = "Tbl")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.RezCreditExpTxt", MessageId = "Rez")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.GluCustomBin", MessageId = "Glu")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.UpgradesTbl", MessageId = "Tbl")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.SfxDataTbl", MessageId = "Sfx")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.SfxDataTbl", MessageId = "Tbl")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.PortDataTbl", MessageId = "Tbl")]
+[module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "member", Target = "SCSharp.UI.BuiltIns.FlingyDat", MessageId = "Flingy")]
+[module: SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Scope = "type", Target = "SCSharp.UI.LogOnScreen", MessageId = "OnScreen")]
+
Modified: trunk/scsharp/src/SCSharpLib/UI/BuiltIns.cs
===================================================================
--- trunk/scsharp/src/SCSharpLib/UI/BuiltIns.cs 2007-05-24 19:03:55 UTC (rev 1396)
+++ trunk/scsharp/src/SCSharpLib/UI/BuiltIns.cs 2007-05-24 19:40:26 UTC (rev 1397)
@@ -37,7 +37,7 @@
/// <summary>
///
/// </summary>
- public const string TitleDlgBin = "rez\\titledlg.bin";
+ public const string TitleDialogBin = "rez\\titledlg.bin";
#if RELEASE
public const string TitlePcx = "glue\\title\\title.pcx";
#else
@@ -68,22 +68,22 @@
/// <summary>
///
/// </summary>
- public const string GluCmpgnBin = "rez\\glucmpgn.bin"; // original
+ public const string GluCampaignBin = "rez\\glucmpgn.bin"; // original
/// <summary>
///
/// </summary>
- public const string GluExpcmpgnBin = "rez\\gluexpcmpgn.bin"; // broodwar
+ public const string GluExpCampaignBin = "rez\\gluexpcmpgn.bin"; // broodwar
/* Play custom screen */
/// <summary>
///
/// </summary>
- public const string GluCustmBin = "rez\\gluCustm.bin";
+ public const string GluCustomBin = "rez\\gluCustm.bin";
/// <summary>
///
/// </summary>
- public const string GluCreatBin = "rez\\gluCreat.bin";
+ public const string GluCreateBin = "rez\\gluCreat.bin";
/* load saved screen */
/// <summary>
@@ -113,13 +113,13 @@
/// <summary>
///
/// </summary>
- public const string GluRdyBin = "rez\\glurdy{0}.bin";
+ public const string GluReadyBin = "rez\\glurdy{0}.bin";
/* Connection screen */
/// <summary>
///
/// </summary>
- public const string GluConnBin = "rez\\gluConn.bin";
+ public const string GluConnectionBin = "rez\\gluConn.bin";
/* Score screen */
/// <summary>
@@ -189,11 +189,11 @@
/// <summary>
///
/// </summary>
- public const string PortdataDat = "arr\\portdata.dat";
+ public const string PortDataDat = "arr\\portdata.dat";
/// <summary>
///
/// </summary>
- public const string PortdataTbl = "arr\\portdata.tbl";
+ public const string PortDataTbl = "arr\\portdata.tbl";
/// <summary>
///
/// </summary>
@@ -247,29 +247,29 @@
/// <summary>
///
/// </summary>
- public const string MouseoverWav = "sound\\glue\\mouseover.wav";
+ public const string MouseOverWav = "sound\\glue\\mouseover.wav";
/// <summary>
///
/// </summary>
- public const string Mousedown2Wav = "sound\\glue\\mousedown2.wav";
+ public const string MouseDown2Wav = "sound\\glue\\mousedown2.wav";
/// <summary>
///
/// </summary>
- public const string SwishinWav = "sound\\glue\\swishin.wav";
+ public const string SwishInWav = "sound\\glue\\swishin.wav";
/// <summary>
///
/// </summary>
- public const string SwishoutWav = "sound\\glue\\swishout.wav";
+ public const string SwishOutWav = "sound\\glue\\swishout.wav";
/* credits */
/// <summary>
///
/// </summary>
- public const string RezCrdtexpTxt = "rez\\crdt_exp.txt";
+ public const string RezCreditExpTxt = "rez\\crdt_exp.txt";
/// <summary>
///
/// </summary>
- public const string RezCrdtlistTxt = "rez\\crdt_lst.txt";
+ public const string RezCreditListTxt = "rez\\crdt_lst.txt";
/* music */
/// <summary>
@@ -289,11 +289,11 @@
/// <summary>
///
/// </summary>
- public const string SndDlgBin = "rez\\snd_dlg.bin";
+ public const string SoundDialogBin = "rez\\snd_dlg.bin";
/// <summary>
///
/// </summary>
- public const string SpdDlgBin = "rez\\spd_dlg.bin";
+ public const string SpeedDialogBin = "rez\\spd_dlg.bin";
/// <summary>
///
/// </summary>
@@ -301,15 +301,15 @@
/// <summary>
///
/// </summary>
- public const string NetDlgBin = "rez\\netdlg.bin";
+ public const string NetDialogBin = "rez\\netdlg.bin";
/// <summary>
///
/// </summary>
- public const string ObjctDlgBin = "rez\\objctdlg.bin";
+ public const string ObjectDialogBin = "rez\\objctdlg.bin";
/// <summary>
///
/// </summary>
- public const string AbrtMenuBin = "rez\\abrtmenu.bin";
+ public const string AbortMenuBin = "rez\\abrtmenu.bin";
/// <summary>
///
/// </summary>
@@ -321,7 +321,7 @@
/// <summary>
///
/// </summary>
- public const string Quit2MnuBin = "rez\\quit2mnu.bin";
+ public const string Quit2MenuBin = "rez\\quit2mnu.bin";
/// <summary>
///
/// </summary>
@@ -339,6 +339,6 @@
/// <summary>
///
/// </summary>
- public const string MinimapBin = "rez\\minimap.bin";
+ public const string MiniMapBin = "rez\\minimap.bin";
}
}
Modified: trunk/scsharp/src/SCSharpLib/UI/ButtonElement.cs
===================================================================
--- trunk/scsharp/src/SCSharpLib/UI/ButtonElement.cs 2007-05-24 19:03:55 UTC (rev 1396)
+++ trunk/scsharp/src/SCSharpLib/UI/ButtonElement.cs 2007-05-24 19:40:26 UTC (rev 1397)
@@ -107,7 +107,7 @@
if (Sensitive && (Flags & SCElement.RespondToMouse) == SCElement.RespondToMouse)
{
/* highlight the text */
- GuiUtility.PlaySound(Mpq, BuiltIns.MouseoverWav);
+ GuiUtility.PlaySound(Mpq, BuiltIns.MouseOverWav);
}
base.MouseEnter();
}
Modified: trunk/scsharp/src/SCSharpLib/UI/ConnectionScreen.cs
===================================================================
--- trunk/scsharp/src/SCSharpLib/UI/ConnectionScreen.cs 2007-05-24 19:03:55 UTC (rev 1396)
+++ trunk/scsharp/src/SCSharpLib/UI/ConnectionScreen.cs 2007-05-24 19:40:26 UTC (rev 1397)
@@ -47,7 +47,7 @@
/// </summary>
/// <param name="mpq"></param>
public ConnectionScreen(Mpq mpq)
- : base(mpq, "glue\\PalNl", BuiltIns.GluConnBin)
+ : base(mpq, "glue\\PalNl", BuiltIns.GluConnectionBin)
{
}
Modified: trunk/scsharp/src/SCSharpLib/UI/CreditsScreen.cs
===================================================================
--- trunk/scsharp/src/SCSharpLib/UI/CreditsScreen.cs 2007-05-24 19:03:55 UTC (rev 1396)
+++ trunk/scsharp/src/SCSharpLib/UI/CreditsScreen.cs 2007-05-24 19:40:26 UTC (rev 1397)
@@ -64,11 +64,11 @@
/* broodwar credits */
if (Game.Instance.IsBroodWar)
{
- AddMarkup((Stream)this.Mpq.GetResource(BuiltIns.RezCrdtexpTxt));
+ AddMarkup((Stream)this.Mpq.GetResource(BuiltIns.RezCreditExpTxt));
}
/* starcraft credits */
- AddMarkup((Stream)this.Mpq.GetResource(BuiltIns.RezCrdtlistTxt));
+ AddMarkup((Stream)this.Mpq.GetResource(BuiltIns.RezCreditListTxt));
}
/// <summary>
Modified: trunk/scsharp/src/SCSharpLib/UI/EndMissionDialog.cs
===================================================================
--- trunk/scsharp/src/SCSharpLib/UI/EndMissionDialog.cs 2007-05-24 19:03:55 UTC (rev 1396)
+++ trunk/scsharp/src/SCSharpLib/UI/EndMissionDialog.cs 2007-05-24 19:40:26 UTC (rev 1397)
@@ -49,7 +49,7 @@
/// <param name="parent"></param>
/// <param name="mpq"></param>
public EndMissionDialog(UIScreen parent, Mpq mpq)
- : base(parent, mpq, "glue\\Palmm", BuiltIns.AbrtMenuBin)
+ : base(parent, mpq, "glue\\Palmm", BuiltIns.AbortMenuBin)
{
BackgroundPath = null;
}
Modified: trunk/scsharp/src/SCSharpLib/UI/GameScreen.cs
===================================================================
--- trunk/scsharp/src/SCSharpLib/UI/GameScreen.cs 2007-05-24 19:03:55 UTC (rev 1396)
+++ trunk/scsharp/src/SCSharpLib/UI/GameScreen.cs 2007-05-24 19:40:26 UTC (rev 1397)
@@ -668,7 +668,7 @@
units.Add(unit);
}
- if (template != null && (template.InitialUnits != InitialUnits.UseMapSettings))
+ if (template != null && (template.InitialUnits != InitialUnitsSetting.UseMapSettings))
{
foreach (Unit sl in startLocations)
{
Modified: trunk/scsharp/src/SCSharpLib/UI/GuiUtility.cs
===================================================================
--- trunk/scsharp/src/SCSharpLib/UI/GuiUtility.cs 2007-05-24 19:03:55 UTC (rev 1396)
+++ trunk/scsharp/src/SCSharpLib/UI/GuiUtility.cs 2007-05-24 19:40:26 UTC (rev 1397)
@@ -103,7 +103,7 @@
{
if (glyph == null)
{
- throw new ArgumentNullException("g");
+ throw new ArgumentNullException("glyph");
}
if (palette == null)
{
Modified: trunk/scsharp/src/SCSharpLib/UI/LoginScreen.cs
===================================================================
--- trunk/scsharp/src/SCSharpLib/UI/LoginScreen.cs 2007-05-24 19:03:55 UTC (rev 1396)
+++ trunk/scsharp/src/SCSharpLib/UI/LoginScreen.cs 2007-05-24 19:40:26 UTC (rev 1397)
@@ -183,16 +183,55 @@
d.ShowDialog(okd);
}
- #region IDisposable Members
+ #region IDisposable Members
+ bool disposed;
/// <summary>
- ///
+ /// Destroy sprite
/// </summary>
+ /// <param name="disposing">If true, remove all unamanged resources</param>
+ protected virtual void Dispose(bool disposing)
+ {
+ if (!this.disposed)
+ {
+ if (disposing)
+ {
+ //if (this.d != null)
+ //{
+ // this.dropDownSurface.Dispose();
+ // this.dropDownSurface = null;
+ //}
+ }
+ this.disposed = true;
+ }
+ }
+
+ /// <summary>
+ /// Destroy object
+ /// </summary>
public void Dispose()
{
- throw new SCException("The method or operation is not implemented.");
+ this.Dispose(true);
+ GC.SuppressFinalize(this);
}
+ /// <summary>
+ /// Destroy object
+ /// </summary>
+ public void Close()
+ {
+ Dispose();
+ }
+
+ /// <summary>
+ /// Destroy object
+ /// </summary>
+ ~LogOnScreen()
+ {
+ Dispose(false);
+ }
+
+
#endregion
}
}
Modified: trunk/scsharp/src/SCSharpLib/UI/MainMenu.cs
===================================================================
--- trunk/scsharp/src/SCSharpLib/UI/MainMenu.cs 2007-05-24 19:03:55 UTC (rev 1396)
+++ trunk/scsharp/src/SCSharpLib/UI/MainMenu.cs 2007-05-24 19:40:26 UTC (rev 1397)
@@ -72,7 +72,7 @@
try
{
Game.Instance.PlayingBroodWar = args.Expansion;
- GuiUtility.PlaySound(this.Mpq, BuiltIns.Mousedown2Wav);
+ GuiUtility.PlaySound(this.Mpq, BuiltIns.MouseDown2Wav);
Game.Instance.SwitchToScreen(nextScreen);
}
catch (Exception e)
@@ -101,7 +101,7 @@
}
else
{
- GuiUtility.PlaySound(this.Mpq, BuiltIns.Mousedown2Wav);
+ GuiUtility.PlaySound(this.Mpq, BuiltIns.MouseDown2Wav);
Game.Instance.SwitchToScreen(UIScreenType.LogOn);
}
};
@@ -115,7 +115,7 @@
}
else
{
- GuiUtility.PlaySound(this.Mpq, BuiltIns.Mousedown2Wav);
+ GuiUtility.PlaySound(this.Mpq, BuiltIns.MouseDown2Wav);
Game.Instance.SwitchToScreen(UIScreenType.Connection);
}
};
Modified: trunk/scsharp/src/SCSharpLib/UI/NetworkDialog.cs
===================================================================
--- trunk/scsharp/src/SCSharpLib/UI/NetworkDialog.cs 2007-05-24 19:03:55 UTC (rev 1396)
+++ trunk/scsharp/src/SCSharpLib/UI/NetworkDialog.cs 2007-05-24 19:40:26 UTC (rev 1397)
@@ -49,7 +49,7 @@
/// <param name="parent"></param>
/// <param name="mpq"></param>
public NetworkDialog(UIScreen parent, Mpq mpq)
- : base(parent, mpq, "glue\\Palmm", BuiltIns.NetDlgBin)
+ : base(parent, mpq, "glue\\Palmm", BuiltIns.NetDialogBin)
{
BackgroundPath = null;
}
Modified: trunk/scsharp/src/SCSharpLib/UI/ObjectivesDialog.cs
===================================================================
--- trunk/scsharp/src/SCSharpLib/UI/ObjectivesDialog.cs 2007-05-24 19:03:55 UTC (rev 1396)
+++ trunk/scsharp/src/SCSharpLib/UI/ObjectivesDialog.cs 2007-05-24 19:40:26 UTC (rev 1397)
@@ -49,7 +49,7 @@
/// <param name="parent"></param>
/// <param name="mpq"></param>
public ObjectivesDialog(UIScreen parent, Mpq mpq)
- : base(parent, mpq, "glue\\Palmm", BuiltIns.ObjctDlgBin)
+ : base(parent, mpq, "glue\\Palmm", BuiltIns.ObjectDialogBin)
{
BackgroundPath = null;
}
Modified: trunk/scsharp/src/SCSharpLib/UI/PlayCustomScreen.cs
===================================================================
--- trunk/scsharp/src/SCSharpLib/UI/PlayCustomScreen.cs 2007-05-24 19:03:55 UTC (rev 1396)
+++ trunk/scsharp/src/SCSharpLib/UI/PlayCustomScreen.cs 2007-05-24 19:40:26 UTC (rev 1397)
@@ -48,7 +48,7 @@
/// </summary>
/// <param name="mpq"></param>
public PlayCustomScreen(Mpq mpq)
- : base(mpq, "glue\\PalNl", BuiltIns.GluCustmBin)
+ : base(mpq, "glue\\PalNl", BuiltIns.GluCustomBin)
{
}
Modified: trunk/scsharp/src/SCSharpLib/UI/QuitMissionDialog.cs
===================================================================
--- trunk/scsharp/src/SCSharpLib/UI/QuitMissionDialog.cs 2007-05-24 19:03:55 UTC (rev 1396)
+++ trunk/scsharp/src/SCSharpLib/UI/QuitMissionDialog.cs 2007-05-24 19:40:26 UTC (rev 1397)
@@ -49,7 +49,7 @@
/// <param name="parent"></param>
/// <param name="mpq"></param>
public QuitMissionDialog(UIScreen parent, Mpq mpq)
- : base(parent, mpq, "glue\\Palmm", BuiltIns.Quit2MnuBin)
+ : base(parent, mpq, "glue\\Palmm", BuiltIns.Quit2MenuBin)
{
BackgroundPath = null;
}
Modified: trunk/scsharp/src/SCSharpLib/UI/RaceSelectionScreen.cs
===================================================================
--- trunk/scsharp/src/SCSharpLib/UI/RaceSelectionScreen.cs 2007-05-24 19:03:55 UTC (rev 1396)
+++ trunk/scsharp/src/SCSharpLib/UI/RaceSelectionScreen.cs 2007-05-24 19:40:26 UTC (rev 1397)
@@ -50,7 +50,7 @@
/// <param name="mpq"></param>
public RaceSelectionScreen(Mpq mpq)
: base(mpq, "glue\\PalNl",
- Game.Instance.PlayingBroodWar ? BuiltIns.GluExpcmpgnBin : BuiltIns.GluCmpgnBin)
+ Game.Instance.PlayingBroodWar ? BuiltIns.GluExpCampaignBin : BuiltIns.GluCampaignBin)
{
BackgroundPath = null;
}
Modified: trunk/scsharp/src/SCSharpLib/UI/ReadyRoomScreen.cs
===================================================================
--- trunk/scsharp/src/SCSharpLib/UI/ReadyRoomScreen.cs 2007-05-24 19:03:55 UTC (rev 1396)
+++ trunk/scsharp/src/SCSharpLib/UI/ReadyRoomScreen.cs 2007-05-24 19:40:26 UTC (rev 1397)
@@ -68,7 +68,7 @@
int firstPortraitElementIndex)
: base(mpq,
String.Format("glue\\Ready{0}", Utilities.RaceChar[(int)Game.Instance.Race]),
- String.Format(BuiltIns.GluRdyBin, Utilities.RaceCharLower[(int)Game.Instance.Race]))
+ String.Format(BuiltIns.GluReadyBin, Utilities.RaceCharLower[(int)Game.Instance.Race]))
{
if (mpq == null)
{
Modified: trunk/scsharp/src/SCSharpLib/UI/SoundDialog.cs
===================================================================
--- trunk/scsharp/src/SCSharpLib/UI/SoundDialog.cs 2007-05-24 19:03:55 UTC (rev 1396)
+++ trunk/scsharp/src/SCSharpLib/UI/SoundDialog.cs 2007-05-24 19:40:26 UTC (rev 1397)
@@ -49,7 +49,7 @@
/// <param name="parent"></param>
/// <param name="mpq"></param>
public SoundDialog(UIScreen parent, Mpq mpq)
- : base(parent, mpq, "glue\\Palmm", BuiltIns.SndDlgBin)
+ : base(parent, mpq, "glue\\Palmm", BuiltIns.SoundDialogBin)
{
BackgroundPath = null;
}
Modified: trunk/scsharp/src/SCSharpLib/UI/SpeedDialog.cs
===================================================================
--- trunk/scsharp/src/SCSharpLib/UI/SpeedDialog.cs 2007-05-24 19:03:55 UTC (rev 1396)
+++ trunk/scsharp/src/SCSharpLib/UI/SpeedDialog.cs 2007-05-24 19:40:26 UTC (rev 1397)
@@ -49,7 +49,7 @@
/// <param name="parent"></param>
/// <param name="mpq"></param>
public SpeedDialog(UIScreen parent, Mpq mpq)
- : base(parent, mpq, "glue\\Palmm", BuiltIns.SpdDlgBin)
+ : base(parent, mpq, "glue\\Palmm", BuiltIns.SpeedDialogBin)
{
BackgroundPath = null;
}
Modified: trunk/scsharp/src/SCSharpLib/UI/TitleScreen.cs
===================================================================
--- trunk/scsharp/src/SCSharpLib/UI/TitleScreen.cs 2007-05-24 19:03:55 UTC (rev 1396)
+++ trunk/scsharp/src/SCSharpLib/UI/TitleScreen.cs 2007-05-24 19:40:26 UTC (rev 1397)
@@ -47,7 +47,7 @@
/// </summary>
/// <param name="mpq"></param>
public TitleScreen(Mpq mpq)
- : base(mpq, "glue\\Palmm", BuiltIns.TitleDlgBin)
+ : base(mpq, "glue\\Palmm", BuiltIns.TitleDialogBin)
{
BackgroundPath = BuiltIns.TitlePcx;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
