From 098c38113a61832c399fa2a898508cff1f2d200e Mon Sep 17 00:00:00 2001 From: "Jake.Stine" Date: Mon, 9 Feb 2009 07:47:49 +0000 Subject: [PATCH] Removed various references to "Playground" in plugins and dialogs. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@458 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/IopHw.cpp | 4 ++-- pcsx2/Misc.cpp | 4 ++-- pcsx2/R3000A.cpp | 4 ++-- pcsx2/windows/AboutDlg.cpp | 2 +- pcsx2/windows/pcsx2.rc | 8 +++++--- plugins/CDVDiso/src/CDVDisop.c | 4 ++-- plugins/spu2ghz/src/spu2.cpp | 6 +++--- plugins/zerogs/dx/GSmain.cpp | 8 ++++---- plugins/zeropad/zeropad.cpp | 8 ++++---- plugins/zerospu2/zerospu2.cpp | 6 +++--- 10 files changed, 28 insertions(+), 26 deletions(-) diff --git a/pcsx2/IopHw.cpp b/pcsx2/IopHw.cpp index 3040eec5b5..72defd2dd3 100644 --- a/pcsx2/IopHw.cpp +++ b/pcsx2/IopHw.cpp @@ -31,12 +31,12 @@ void psxHwReset() { memzero_ptr<0x10000>(psxH); -// mdecInit(); //intialize mdec decoder +// mdecInit(); //initialize mdec decoder cdrReset(); cdvdReset(); psxRcntInit(); sioInit(); -// sio2Reset(); + //sio2Reset(); } u8 psxHwRead8(u32 add) { diff --git a/pcsx2/Misc.cpp b/pcsx2/Misc.cpp index 20ed57f84c..18db8fe8fa 100644 --- a/pcsx2/Misc.cpp +++ b/pcsx2/Misc.cpp @@ -59,10 +59,10 @@ const char *LabelAuthors = { N_( "nachbrenner, auMatt, loser, \n" "alexey silinov, goldfinger\n" "\n" - "Playground Mod Devs:\n" + "Devs:\n" "Arcum42, drkIIRaziel, Cottonvibes, \n" "Jake.Stine, Rama\n\n" - "Playground Testing:\n" + "Testing:\n" "Krakatos\n" "\n" "Webmasters: CKemu, Falcon4ever") diff --git a/pcsx2/R3000A.cpp b/pcsx2/R3000A.cpp index 8e191a4e62..54fb9f9a20 100644 --- a/pcsx2/R3000A.cpp +++ b/pcsx2/R3000A.cpp @@ -248,7 +248,7 @@ void psxBranchTest() if ((psxRegs.CP0.n.Status & 0xFE01) >= 0x401) { -// PSXCPU_LOG("Interrupt: %x %x\n", HWMu32(0x1070), HWMu32(0x1074)); + PSXCPU_LOG("Interrupt: %x %x\n", psxHu32(0x1070), psxHu32(0x1074)); psxException(0, 0); iopBranchAction = true; } @@ -261,7 +261,7 @@ void iopTestIntc() if( !eeEventTestIsActive ) { - // An iop exception has occured while the EE is running code. + // An iop exception has occurred while the EE is running code. // Inform the EE to branch so the IOP can handle it promptly: cpuSetNextBranchDelta( 16 ); diff --git a/pcsx2/windows/AboutDlg.cpp b/pcsx2/windows/AboutDlg.cpp index 77da30ae49..b5317c3ef7 100644 --- a/pcsx2/windows/AboutDlg.cpp +++ b/pcsx2/windows/AboutDlg.cpp @@ -38,7 +38,7 @@ LRESULT WINAPI AboutDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) 230, 10, 211, 110, hDlg, (HMENU)IDC_STATIC, GetModuleHandle(NULL), NULL); SendMessage(hW, STM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)hBMP); - SetWindowText(hDlg, _("About PCSX2 - Playground")); + SetWindowText(hDlg, _("About PCSX2")); Button_SetText(GetDlgItem(hDlg, IDOK), _("OK")); Static_SetText(GetDlgItem(hDlg, IDC_PCSX_ABOUT_AUTHORS), _(LabelAuthors)); diff --git a/pcsx2/windows/pcsx2.rc b/pcsx2/windows/pcsx2.rc index 0ae55300c9..565b6b3b5f 100644 --- a/pcsx2/windows/pcsx2.rc +++ b/pcsx2/windows/pcsx2.rc @@ -7,7 +7,8 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxresmw.h" +#include "afxresmw.h" + ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -1042,7 +1043,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK ABOUT_DIALOG DIALOGEX 0, 0, 431, 302 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_ACCEPTFILES -CAPTION "About PCSX2 - Playground" +CAPTION "About PCSX2" FONT 8, "Microsoft Sans Serif", 400, 0, 0x0 BEGIN DEFPUSHBUTTON "OK",IDOK,205,282,50,14 @@ -1714,7 +1715,8 @@ END // // Generated from the TEXTINCLUDE 3 resource. // - + + ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED diff --git a/plugins/CDVDiso/src/CDVDisop.c b/plugins/CDVDiso/src/CDVDisop.c index f7f9eda1c0..e4b7ac989f 100644 --- a/plugins/CDVDiso/src/CDVDisop.c +++ b/plugins/CDVDiso/src/CDVDisop.c @@ -48,9 +48,9 @@ char *methods[] = }; #ifdef _DEBUG -char *LibName = "Linuz/Pg Iso CDVD (Debug) "; +char *LibName = "Linuz Iso CDVD (Debug) "; #else -char *LibName = "Linuz/Pg Iso CDVD "; +char *LibName = "Linuz Iso CDVD "; #endif const unsigned char version = PS2E_CDVD_VERSION; diff --git a/plugins/spu2ghz/src/spu2.cpp b/plugins/spu2ghz/src/spu2.cpp index 03bb0fa8cc..c59db1d134 100644 --- a/plugins/spu2ghz/src/spu2.cpp +++ b/plugins/spu2ghz/src/spu2.cpp @@ -132,7 +132,7 @@ static void InitLibraryName() // Public Release! // Output a simplified string that's just our name: - strcpy( libraryName, "SPU2ghz Playground" ); + strcpy( libraryName, "SPU2ghz" ); #elif defined( SVN_REV_UNKNOWN ) @@ -140,7 +140,7 @@ static void InitLibraryName() // Output a name that includes devbuild status but not // subversion revision tags: - strcpy( libraryName, "SPU2ghz Playground" + strcpy( libraryName, "SPU2ghz" # ifdef _DEBUG_FAST "-Debug" # elif defined( DEBUG ) @@ -154,7 +154,7 @@ static void InitLibraryName() // Use TortoiseSVN's SubWCRev utility's output // to label the specific revision: - sprintf_s( libraryName, "SPU2ghz PG r%d%s" + sprintf_s( libraryName, "SPU2ghz r%d%s" # ifdef _DEBUG_FAST "-Debug" # elif defined( _DEBUG ) diff --git a/plugins/zerogs/dx/GSmain.cpp b/plugins/zerogs/dx/GSmain.cpp index eb1d957347..2745e88d19 100644 --- a/plugins/zerogs/dx/GSmain.cpp +++ b/plugins/zerogs/dx/GSmain.cpp @@ -74,17 +74,17 @@ unsigned char build = VER; unsigned char minor = 1; #ifdef _DEBUG -char *libraryName = "ZeroGS Playground (Debug) "; +char *libraryName = "ZeroGS (Debug) "; #elif defined(RELEASE_TO_PUBLIC) #ifdef ZEROGS_SSE2 -char *libraryName = "ZeroGS Playground"; +char *libraryName = "ZeroGS"; #else -char *libraryName = "ZeroGS Playground (no SSE2)"; +char *libraryName = "ZeroGS (no SSE2)"; #endif #else -char *libraryName = "ZeroGS Playground (Dev) "; +char *libraryName = "ZeroGS (Dev) "; #endif static const char* s_aa[5] = { "AA none |", "AA 2x |", "AA 4x |", "AA 8x", "AA 16x" }; diff --git a/plugins/zeropad/zeropad.cpp b/plugins/zeropad/zeropad.cpp index a5f9aabcfe..51e88d4c5a 100644 --- a/plugins/zeropad/zeropad.cpp +++ b/plugins/zeropad/zeropad.cpp @@ -143,7 +143,7 @@ static void InitLibraryName() // Public Release! // Output a simplified string that's just our name: - strcpy( libraryName, "ZeroPAD Playground" ); + strcpy( libraryName, "ZeroPAD" ); #elif defined( SVN_REV_UNKNOWN ) @@ -151,7 +151,7 @@ static void InitLibraryName() // Output a name that includes devbuild status but not // subversion revision tags: - strcpy( libraryName, "ZeroPAD Playground" + strcpy( libraryName, "ZeroPAD" # ifdef _DEBUG "-Debug" # endif @@ -161,7 +161,7 @@ static void InitLibraryName() // Use TortoiseSVN's SubWCRev utility's output // to label the specific revision: - sprintf_s( libraryName, "ZeroPAD PPr%d%s" + sprintf_s( libraryName, "ZeroPAD r%d%s" # ifdef _DEBUG "-Debug" # else @@ -174,7 +174,7 @@ static void InitLibraryName() #else // I'll fix up SVN support later. --arcum42 - strcpy( libraryName, "ZeroPAD Playground" + strcpy( libraryName, "ZeroPAD" # ifdef _DEBUG "-Debug" # endif diff --git a/plugins/zerospu2/zerospu2.cpp b/plugins/zerospu2/zerospu2.cpp index 18eb832536..a125025ede 100644 --- a/plugins/zerospu2/zerospu2.cpp +++ b/plugins/zerospu2/zerospu2.cpp @@ -117,7 +117,7 @@ static void InitLibraryName() // Public Release! // Output a simplified string that's just our name: - strcpy( libraryName, "ZeroSPU2 Playground" ); + strcpy( libraryName, "ZeroSPU2" ); #elif defined( SVN_REV_UNKNOWN ) @@ -125,7 +125,7 @@ static void InitLibraryName() // Output a name that includes devbuild status but not // subversion revision tags: - strcpy( libraryName, "ZeroSPU2 Playground" + strcpy( libraryName, "ZeroSPU2" # ifdef _DEBUG "-Debug" # endif @@ -135,7 +135,7 @@ static void InitLibraryName() // Use TortoiseSVN's SubWCRev utility's output // to label the specific revision: - sprintf_s( libraryName, "ZeroSPU2 PG r%d%s" + sprintf_s( libraryName, "ZeroSPU2 r%d%s" # ifdef _DEBUG "-Debug" # else