From 092b5d969d7e5e7f705af8b84dfd53b023d8f1c1 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Fri, 28 Oct 2005 03:10:48 +0000 Subject: [PATCH] move all URLs into ProductInfo.h --- stepmania/src/ProductInfo.h | 3 +++ stepmania/src/RageDisplay_OGL.cpp | 3 ++- stepmania/src/StepMania.cpp | 2 +- stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp | 2 +- stepmania/src/arch/Dialog/DialogDriver_Win32.cpp | 3 ++- stepmania/src/archutils/Win32/Crash.cpp | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/stepmania/src/ProductInfo.h b/stepmania/src/ProductInfo.h index d8c9eccf6a..69236f5a37 100644 --- a/stepmania/src/ProductInfo.h +++ b/stepmania/src/ProductInfo.h @@ -10,6 +10,9 @@ //#define PRODUCT_VER "4.0 alpha 1" #define PRODUCT_NAME_VER PRODUCT_NAME " " PRODUCT_VER +#define VIDEO_TROUBLESHOOTING_URL "http://www.stepmania.com/stepmania/mediawiki.php?title=Video_Driver_Troubleshooting" +#define REPORT_BUG_URL "http://sourceforge.net/tracker/?func=add&group_id=37892&atid=421366" + #endif /* diff --git a/stepmania/src/RageDisplay_OGL.cpp b/stepmania/src/RageDisplay_OGL.cpp index 04936ef015..376dacb8a7 100644 --- a/stepmania/src/RageDisplay_OGL.cpp +++ b/stepmania/src/RageDisplay_OGL.cpp @@ -46,6 +46,7 @@ #include "RageMath.h" #include "RageTypes.h" #include "RageUtil.h" +#include "ProductInfo.h" #include "arch/LowLevelWindow/LowLevelWindow.h" @@ -456,7 +457,7 @@ CString RageDisplay_OGL::Init( VideoModeParams p, bool bAllowUnacceleratedRender * too using Direct3D directly. (If we can't, it's a bug that we can work * around--if GLDirect can do it, so can we!) */ if( !strncmp( (const char *) glGetString(GL_RENDERER), "GLDirect", 8 ) ) - return "GLDirect was detected. GLDirect is not compatible with StepMania, and should be disabled.\n"; + return "GLDirect was detected. GLDirect is not compatible with " PRODUCT_NAME ", and should be disabled.\n"; #endif #if defined(UNIX) diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index 7d32cdf498..0013d904a0 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -693,7 +693,7 @@ RageDisplay *CreateDisplay() CString error = "There was an error while initializing your video card.\n\n" "Please do not file this error as a bug! Use the web page below to troubleshoot this problem.\n\n" - "http://www.stepmania.com/stepmania/mediawiki.php?title=Video_Driver_Troubleshooting\n\n" + VIDEO_TROUBLESHOOTING_URL "\n\n" "Video Driver: "+GetVideoDriverName()+"\n\n"; CStringArray asRenderers; diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp b/stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp index 3d463c3f6e..b9ddbb676f 100644 --- a/stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp +++ b/stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp @@ -132,7 +132,7 @@ void ArchHooks_Win32::CheckVideoDriver() if( info.sDescription != sPrimaryDeviceName ) continue; - /* "IntelR 810 Chipset Graphics Driver PV 2.1". I get a lot of crash reports + /* "IntelR 810 Chipset Graphics Driver PV 2.1". There are a lot of crash reports * with people using this version. */ if( Regex( "Intel.* 810 Chipset Graphics Driver PV 2.1").Compare( info.sDescription ) ) { diff --git a/stepmania/src/arch/Dialog/DialogDriver_Win32.cpp b/stepmania/src/arch/Dialog/DialogDriver_Win32.cpp index caf1bde9ff..49546bc9df 100644 --- a/stepmania/src/arch/Dialog/DialogDriver_Win32.cpp +++ b/stepmania/src/arch/Dialog/DialogDriver_Win32.cpp @@ -3,6 +3,7 @@ #include "RageUtil.h" #include "CommonMetrics.h" // for WINDOW_TITLE #include "ThemeManager.h" +#include "ProductInfo.h" #include "archutils/win32/AppInstance.h" #include "archutils/win32/GotoURL.h" @@ -113,7 +114,7 @@ static BOOL CALLBACK ErrorWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lP } break; case IDC_BUTTON_REPORT: - GotoURL( "http://sourceforge.net/tracker/?func=add&group_id=37892&atid=421366" ); + GotoURL( REPORT_BUG_URL ); break; case IDC_BUTTON_RESTART: Win32RestartProgram(); diff --git a/stepmania/src/archutils/Win32/Crash.cpp b/stepmania/src/archutils/Win32/Crash.cpp index d874ea3108..32554358bb 100644 --- a/stepmania/src/archutils/Win32/Crash.cpp +++ b/stepmania/src/archutils/Win32/Crash.cpp @@ -931,7 +931,7 @@ BOOL APIENTRY CrashDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) EndDialog( hDlg, FALSE ); break; case IDC_BUTTON_REPORT: - GotoURL( "http://sourceforge.net/tracker/?func=add&group_id=37892&atid=421366" ); + GotoURL( REPORT_BUG_URL ); break; } break;