ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change "Interim Build" to "Developer Build" and rename flag variable name, as this is more accurate to the intent of this type of build (unofficial interim builds still shouldn't have developer features or unfinished developer work)

This commit is contained in:
adelikat 2014-06-04 17:02:54 +00:00
parent ff6032cbdc
commit 8f2746ab86
11 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Client.Common/RomLoader.cs
View File

@ -403,7 +403,7 @@ namespace BizHawk.Client.Common
nextEmulator = c64;
break;
case "GBA":
if (VersionInfo.INTERIM)
if (VersionInfo.DeveloperBuild)
{
var gba = new GBA(nextComm);
gba.Load(rom.RomData);
@ -420,7 +420,7 @@ namespace BizHawk.Client.Common
GetCoreSettings<WonderSwan>(), GetCoreSyncSettings<WonderSwan>());
break;
case "DEBUG":
if (VersionInfo.INTERIM)
if (VersionInfo.DeveloperBuild)
{
nextEmulator = LibRetroEmulator.CreateDebug(nextComm, rom.RomData);
}

6
BizHawk.Client.EmuHawk/AboutBox.cs
View File

@ -127,7 +127,7 @@ namespace BizHawk.Client.EmuHawk
using (Font font = new Font("Courier New", 20, FontStyle.Bold))
{
if (bounceCounter == -1) return;
const string str = "INTERIM BUILD";
const string str = "DEVELOPER BUILD";
float x = 0;
int timefactor = bounceCounter;
for (int i = 0; i < str.Length; i++)
@ -160,9 +160,9 @@ namespace BizHawk.Client.EmuHawk
private void AboutBox_Load(object sender, EventArgs e)
{
#if DEBUG
Text = "BizHawk Interim Build (DEBUG MODE) SVN r" + SubWCRev.SVN_REV;
Text = "BizHawk Developer Build (DEBUG MODE) SVN r" + SubWCRev.SVN_REV;
#else
Text = "BizHawk Interim Build (RELEASE MODE) SVN r" + SubWCRev.SVN_REV;
Text = "BizHawk Developer Build (RELEASE MODE) SVN r" + SubWCRev.SVN_REV;
#endif
if (DateTime.Now > DateTime.Parse("12/17/2013") && DateTime.Now <= DateTime.Parse("12/25/2013"))
{

2
BizHawk.Client.EmuHawk/BizBox.cs
View File

@ -26,7 +26,7 @@ namespace BizHawk.Client.EmuHawk
private void BizBox_Load(object sender, EventArgs e)
{
if (VersionInfo.INTERIM)
if (VersionInfo.DeveloperBuild)
{
Text = " BizHawk (SVN r" + SubWCRev.SVN_REV + ")";
}

8
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -992,7 +992,7 @@ namespace BizHawk.Client.EmuHawk
TAStudioMenuItem.Enabled =
VirtualPadMenuItem.Enabled =
!(Global.Emulator is NullEmulator);
batchRunnerToolStripMenuItem.Visible = VersionInfo.INTERIM;
batchRunnerToolStripMenuItem.Visible = VersionInfo.DeveloperBuild;
}
private void ToolBoxMenuItem_Click(object sender, EventArgs e)
@ -1073,7 +1073,7 @@ namespace BizHawk.Client.EmuHawk
FDSControlsMenuItem.Enabled = Global.Emulator.BoardName == "FDS";
NESDebuggerMenuItem.Visible =
VersionInfo.INTERIM;
VersionInfo.DeveloperBuild;
NESDebuggerMenuItem.Enabled =
NESPPUViewerMenuItem.Enabled =
@ -1433,7 +1433,7 @@ namespace BizHawk.Client.EmuHawk
private void AtariSubMenu_DropDownOpened(object sender, EventArgs e)
{
if (!VersionInfo.INTERIM)
if (!VersionInfo.DeveloperBuild)
{
Atari2600DebuggerMenuItem.Visible =
toolStripSeparator31.Visible =
@ -1737,7 +1737,7 @@ namespace BizHawk.Client.EmuHawk
private void AboutMenuItem_Click(object sender, EventArgs e)
{
if (VersionInfo.INTERIM)
if (VersionInfo.DeveloperBuild)
{
new AboutBox().ShowDialog();
}

10
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -37,7 +37,7 @@ namespace BizHawk.Client.EmuHawk
private void MainForm_Load(object sender, EventArgs e)
{
Text = "BizHawk" + (VersionInfo.INTERIM ? " (interim) " : string.Empty);
Text = "BizHawk" + (VersionInfo.DeveloperBuild ? " (interim) " : string.Empty);
Global.CheatList.Changed += ToolHelpers.UpdateCheatRelatedTools;
@ -549,7 +549,7 @@ namespace BizHawk.Client.EmuHawk
{ "WSWAN", "WonderSwan" }
};
if (VersionInfo.INTERIM)
if (VersionInfo.DeveloperBuild)
{
released.Add("GBA", "Gameboy Advance");
released.Add("C64", "Commodore 64");
@ -1400,7 +1400,7 @@ namespace BizHawk.Client.EmuHawk
{
var str = Global.SystemInfo.DisplayName;
if (VersionInfo.INTERIM)
if (VersionInfo.DeveloperBuild)
{
str += " (interim)";
}
@ -1670,7 +1670,7 @@ namespace BizHawk.Client.EmuHawk
var ofd = new OpenFileDialog { InitialDirectory = PathManager.GetRomsPath(Global.Emulator.SystemId) };
// adelikat: ugly design for this, I know
if (VersionInfo.INTERIM)
if (VersionInfo.DeveloperBuild)
{
ofd.Filter = FormatFilter(
"Rom Files", "*.nes;*.fds;*.sms;*.gg;*.sg;*.pce;*.sgx;*.bin;*.smd;*.rom;*.a26;*.a78;*.cue;*.exe;*.gb;*.gbc;*.gen;*.md;*.col;.int;*.smc;*.sfc;*.prg;*.d64;*.g64;*.crt;*.sgb;*.xml;*.z64;*.v64;*.n64;*.ws;*.wsc;%ARCH%",
@ -3175,7 +3175,7 @@ namespace BizHawk.Client.EmuHawk
RewireSound();
Global.Rewinder.ResetRewindBuffer();
Text = "BizHawk" + (VersionInfo.INTERIM ? " (interim) " : string.Empty);
Text = "BizHawk" + (VersionInfo.DeveloperBuild ? " (interim) " : string.Empty);
HandlePlatformMenus();
_stateSlots.Clear();
UpdateDumpIcon();

4
BizHawk.Client.EmuHawk/Program.cs
View File

@ -49,7 +49,7 @@ namespace BizHawk.Client.EmuHawk
// this check has to be done VERY early. i stepped through a debug build with wrong .dll versions purposely used,
// and there was a TypeLoadException before the first line of SubMain was reached (some static ColorType init?)
// zero 25-dec-2012 - only do for public builds. its annoying during development
if (!VersionInfo.INTERIM)
if (!VersionInfo.DeveloperBuild)
{
var thisversion = typeof(Program).Assembly.GetName().Version;
var utilversion = Assembly.LoadWithPartialName("Bizhawk.Client.Common").GetName().Version;
@ -110,7 +110,7 @@ namespace BizHawk.Client.EmuHawk
catch (Exception e)
{
#if WINDOWS
if (!VersionInfo.INTERIM && Global.MovieSession.Movie.IsActive)
if (!VersionInfo.DeveloperBuild && Global.MovieSession.Movie.IsActive)
{
var result = MessageBox.Show(
"EmuHawk has thrown a fatal exception and is about to close.\nA movie has been detected. Would you like to try to save?\n(Note: Depending on what caused this error, this may or may succeed)",

2
BizHawk.Client.EmuHawk/config/PathConfig.cs
View File

@ -15,7 +15,7 @@ namespace BizHawk.Client.EmuHawk
private void LockDownCores()
{
if (VersionInfo.INTERIM)
if (VersionInfo.DeveloperBuild)
{
return;
}

2
BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs
View File

@ -180,7 +180,7 @@ namespace BizHawk.Client.EmuHawk
GameGenieToolbarSeparator.Visible =
LoadGameGenieToolbarItem.Visible =
(Global.Emulator.SystemId == "NES")
|| (Global.Emulator.SystemId == "GEN" && VersionInfo.INTERIM)
|| (Global.Emulator.SystemId == "GEN" && VersionInfo.DeveloperBuild)
|| (Global.Emulator.SystemId == "GB")
|| (Global.Game.System == "GG")
|| (Global.Emulator is LibsnesCore);

4
BizHawk.Client.EmuHawk/tools/ToolBox.cs
View File

@ -73,7 +73,7 @@ namespace BizHawk.Client.EmuHawk
GbaGpuViewerToolBarItem.Visible = Global.Emulator is GBA;
GenesisGameGenieToolBarItem.Visible = Global.Emulator.SystemId == "GEN" && VersionInfo.INTERIM;
GenesisGameGenieToolBarItem.Visible = Global.Emulator.SystemId == "GEN" && VersionInfo.DeveloperBuild;
GenesisVdpToolBarItem.Visible = Global.Emulator is GPGX;
SmsVdpToolbarItem.Visible = Global.Emulator is SMS;
@ -87,7 +87,7 @@ namespace BizHawk.Client.EmuHawk
}
}
NesDebuggerToolbarItem.Visible = VersionInfo.INTERIM && Global.Emulator.SystemId == "NES";
NesDebuggerToolbarItem.Visible = VersionInfo.DeveloperBuild && Global.Emulator.SystemId == "NES";
}
private void SetSize()

2
BizHawk.Client.EmuHawk/tools/ToolManager.cs
View File

@ -455,7 +455,7 @@ namespace BizHawk.Client.EmuHawk
{
Load<GBGameGenie>();
}
else if (Global.Emulator.SystemId == "GEN" && VersionInfo.INTERIM)
else if (Global.Emulator.SystemId == "GEN" && VersionInfo.DeveloperBuild)
{
Load<GenGameGenie>();
}

4
VersionInfo.cs
View File

@ -4,10 +4,10 @@ static class VersionInfo
{
public const string MAINVERSION = "1.7.0";
public static string RELEASEDATE = "Unoffical BETA of unknown origin!";
public static bool INTERIM = true;
public static bool DeveloperBuild = true;
public static string GetEmuVersion()
{
return INTERIM ? "SVN " + SubWCRev.SVN_REV : ("Version " + MAINVERSION);
return DeveloperBuild ? "SVN " + SubWCRev.SVN_REV : ("Version " + MAINVERSION);
}
}