From ce6e56c14f862e4f357e4d34d6a90570c5293dbb Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Fri, 4 Nov 2005 03:24:53 +0000 Subject: [PATCH] use PRODUCT_NAME --- stepmania/src/archutils/Darwin/Crash.m | 8 +++++--- stepmania/src/archutils/Win32/Crash.cpp | 2 +- stepmania/src/archutils/Win32/RestartProgram.cpp | 2 +- stepmania/src/archutils/Win32/WindowsResources.rc | 12 ++++++------ stepmania/src/archutils/Win32/mapconv.cpp | 2 +- stepmania/src/smpackage/ChangeGameSettings.cpp | 4 ++-- stepmania/src/smpackage/MainMenuDlg.cpp | 2 +- 7 files changed, 17 insertions(+), 15 deletions(-) diff --git a/stepmania/src/archutils/Darwin/Crash.m b/stepmania/src/archutils/Darwin/Crash.m index 9d5f3da11a..ecfd842c68 100644 --- a/stepmania/src/archutils/Darwin/Crash.m +++ b/stepmania/src/archutils/Darwin/Crash.m @@ -1,9 +1,11 @@ +#include "ProductInfo.h" + void InformUserOfCrash( const char *sPath ) { - NSString *s = @"StepMania has crashed. Debugging information has been output to\n\n%s\n\n" - @"Please file a bug report at\n\nhttp://sf.net/tracker/?func=add&group_id=37892&atid=421366"; + NSString *s = @PRODUCT_NAME " has crashed. Debugging information has been output to\n\n%s\n\n" + @"Please file a bug report at\n\n" REPORT_BUG_URL; - int ret = NSRunAlertPanel( @"StepMania has crashed", s, @"Open crashinfo.txt", @"Quit", nil, sPath ); + int ret = NSRunAlertPanel( @PRODUCT_NAME " has crashed", s, @"Open crashinfo.txt", @"Quit", nil, sPath ); if( ret == NSAlertDefaultReturn ) { diff --git a/stepmania/src/archutils/Win32/Crash.cpp b/stepmania/src/archutils/Win32/Crash.cpp index 32554358bb..f06a37f283 100644 --- a/stepmania/src/archutils/Win32/Crash.cpp +++ b/stepmania/src/archutils/Win32/Crash.cpp @@ -445,7 +445,7 @@ bool VDDebugInfoInitFromMemory(VDDebugInfoContext *pctx, const void *_src) { pctx->pRVAHeap = NULL; - if (memcmp((char *)src, "StepMania symbolic debug information", 36)) + if (memcmp((char *)src, PRODUCT_NAME " symbolic debug information", 36)) return false; // Extract fields diff --git a/stepmania/src/archutils/Win32/RestartProgram.cpp b/stepmania/src/archutils/Win32/RestartProgram.cpp index c0422e9917..61c19293e4 100644 --- a/stepmania/src/archutils/Win32/RestartProgram.cpp +++ b/stepmania/src/archutils/Win32/RestartProgram.cpp @@ -7,7 +7,7 @@ void Win32RestartProgram() TCHAR szFullAppPath[MAX_PATH]; GetModuleFileName(NULL, szFullAppPath, MAX_PATH); - // Launch StepMania + // Relaunch PROCESS_INFORMATION pi; STARTUPINFO si; ZeroMemory( &si, sizeof(si) ); diff --git a/stepmania/src/archutils/Win32/WindowsResources.rc b/stepmania/src/archutils/Win32/WindowsResources.rc index 8bb8c35a33..694290f73c 100644 --- a/stepmania/src/archutils/Win32/WindowsResources.rc +++ b/stepmania/src/archutils/Win32/WindowsResources.rc @@ -28,7 +28,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_ERROR_DIALOG DIALOGEX 0, 0, 332, 234 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION -CAPTION "StepMania Error" +CAPTION "Error" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN DEFPUSHBUTTON "Close",IDOK,265,215,60,15 @@ -36,9 +36,9 @@ BEGIN WS_VSCROLL | NOT WS_TABSTOP PUSHBUTTON "View Log",IDC_BUTTON_VIEW_LOG,8,215,74,15 PUSHBUTTON "Report the Error",IDC_BUTTON_REPORT,90,215,76,15 - PUSHBUTTON "Restart StepMania",IDC_BUTTON_RESTART,175,215,80,15 + PUSHBUTTON "Restart Game",IDC_BUTTON_RESTART,175,215,80,15 CONTROL 129,IDC_STATIC,"Static",SS_BITMAP,0,0,332,38 - LTEXT "Sorry! An error has occurred while running StepMania.\r\n\r\nSpecific details about the error may be shown in the box below:", + LTEXT "Sorry! A fatal error has occurred.\r\n\r\nSpecific details about the error may be shown in the box below:", IDC_STATIC,7,46,298,28 END @@ -57,7 +57,7 @@ END IDD_DISASM_CRASH DIALOGEX 0, 0, 399, 151 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION -CAPTION "StepMania Error" +CAPTION "Error" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN PUSHBUTTON "&View crash dump",IDC_CRASH_SAVE,1,135,70,15 @@ -70,7 +70,7 @@ BEGIN LTEXT "crash reason: programmer needs good whack on head", IDC_STATIC_BOMBREASON,8,120,219,8 CONTROL 121,IDC_STATIC,"Static",SS_BITMAP,1,2,396,36 - LTEXT "StepMania has crashed due to a program error. Diagnostic information has been saved to a file called ""crashinfo.txt"" in the StepMania program directory. Hit ""View crash dump"" to view it. Please include this file in all bug reports.", + LTEXT "A fatal error has occurred. Diagnostic information has been saved to a file called ""crashinfo.txt"" in the game program directory. Hit ""View crash dump"" to view it. Please include this file in all bug reports.", IDC_STATIC,8,41,382,19 LTEXT "Estimated call stack",IDC_STATIC,7,64,64,8 END @@ -78,7 +78,7 @@ END IDD_OK DIALOG 0, 0, 318, 87 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION -CAPTION "StepMania" +CAPTION "Prompt" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,131,66,50,14 diff --git a/stepmania/src/archutils/Win32/mapconv.cpp b/stepmania/src/archutils/Win32/mapconv.cpp index 177e83990a..b5e0ffb3ed 100644 --- a/stepmania/src/archutils/Win32/mapconv.cpp +++ b/stepmania/src/archutils/Win32/mapconv.cpp @@ -267,7 +267,7 @@ int main(int argc, char **argv) { // dump data - static const char header[64]="StepMania symbolic debug information\r\n\x1A"; + static const char header[64]= PRODUCT_NAME " symbolic debug information\r\n\x1A"; fwrite(header, 64, 1, fo); diff --git a/stepmania/src/smpackage/ChangeGameSettings.cpp b/stepmania/src/smpackage/ChangeGameSettings.cpp index f4b460f4aa..3eb933b0ab 100644 --- a/stepmania/src/smpackage/ChangeGameSettings.cpp +++ b/stepmania/src/smpackage/ChangeGameSettings.cpp @@ -50,7 +50,7 @@ BOOL ChangeGameSettings::OnInitDialog() // Fill the radio buttons // IniFile ini; - ini.SetPath( "Data\\StepMania.ini" ); + ini.SetPath( "Data\\" PRODUCT_NAME ); ini.ReadFile(); CString sValue; @@ -99,7 +99,7 @@ void ChangeGameSettings::OnOK() { // TODO: Add extra validation here IniFile ini; - ini.SetPath( "Data\\StepMania.ini" ); + ini.SetPath( "Data\\" PRODUCT_NAME ); ini.ReadFile(); diff --git a/stepmania/src/smpackage/MainMenuDlg.cpp b/stepmania/src/smpackage/MainMenuDlg.cpp index 030dbc06a4..3e7024a624 100644 --- a/stepmania/src/smpackage/MainMenuDlg.cpp +++ b/stepmania/src/smpackage/MainMenuDlg.cpp @@ -195,5 +195,5 @@ BOOL MainMenuDlg::OnInitDialog() void MainMenuDlg::OnOpenStepmaniaIni() { // TODO: Add your control notification handler code here - ::ShellExecute( this->m_hWnd, "open", "Data\\StepMania.ini", "", "", SW_SHOWNORMAL ); + ::ShellExecute( this->m_hWnd, "open", "Data\\" PRODUCT_NAME, "", "", SW_SHOWNORMAL ); }