From f665c8255c04994acff5d65e7ff1c072a57802db Mon Sep 17 00:00:00 2001 From: "sudonim1@gmail.com" Date: Wed, 14 Nov 2012 18:51:12 +0000 Subject: [PATCH] 1.0: Merged new release flag system. git-svn-id: http://pcsx2.googlecode.com/svn/branches/1.0@5455 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/SysForwardDefs.h | 1 + pcsx2/gui/MainFrame.cpp | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pcsx2/SysForwardDefs.h b/pcsx2/SysForwardDefs.h index 049698a54a..2aec4ecf84 100644 --- a/pcsx2/SysForwardDefs.h +++ b/pcsx2/SysForwardDefs.h @@ -18,6 +18,7 @@ static const int PCSX2_VersionHi = 1; static const int PCSX2_VersionMid = 0; static const int PCSX2_VersionLo = 0; +static const bool PCSX2_isReleaseVersion = 0; class SysCoreThread; class CpuInitializerSet; diff --git a/pcsx2/gui/MainFrame.cpp b/pcsx2/gui/MainFrame.cpp index c053f68a72..b5ef80e335 100644 --- a/pcsx2/gui/MainFrame.cpp +++ b/pcsx2/gui/MainFrame.cpp @@ -349,19 +349,19 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title) wxSize backsize( m_background.GetSize() ); wxString wintitle; - if( PCSX2_VersionLo & 1 ) + if( PCSX2_isReleaseVersion ) { - // Odd versions: beta / development editions, which feature revision number and compile date. - wintitle.Printf( _("%s %d.%d.%d.%d%s (svn) %s"), pxGetAppName().c_str(), PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo, - SVN_REV, SVN_MODS ? L"m" : wxEmptyString, fromUTF8(__DATE__).c_str() ); - } - else - { - // evens: stable releases, with a simpler title. + // stable releases, with a simple title. wintitle.Printf( _("%s %d.%d.%d %s"), pxGetAppName().c_str(), PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo, SVN_MODS ? _("(modded)") : wxEmptyString ); } + else + { + // beta / development editions, which feature revision number and compile date. + wintitle.Printf( _("%s %d.%d.%d.%d%s (svn) %s"), pxGetAppName().c_str(), PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo, + SVN_REV, SVN_MODS ? L"m" : wxEmptyString, fromUTF8(__DATE__).c_str() ); + } SetTitle( wintitle );