actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert D3D exception handling (my changes broke it)

Browse Source
This commit is contained in:
Chris Danford
2003-06-22 17:45:19 +00:00
parent 0677140208
commit cb3092e70d
2 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageDisplay_D3D.h
+2 -18
View File
@@ -1,24 +1,8 @@
#ifndef RAGEDISPLAY_D3D_H
#define RAGEDISPLAY_D3D_H
class RageException_D3DNotInstalled: public exception
{
const char *what() { return
"DirectX 8.1 or greater is not installed. You can download it from:\n"
"http://search.microsoft.com/gomsuri.asp?n=1&c=rp_BestBets&siteid=us&target=http://www.microsoft.com/downloads/details.aspx?FamilyID=a19bed22-0b25-4e5d-a584-6389d8a3dad0&displaylang=en"; }
};
class RageException_D3DNoAcceleration: public exception
{
const char *what() { return
"Your system is reporting that Direct3D hardware acceleration is not available. "
"Please obtain an updated driver from your video card manufacturer.\n\n"; }
};
class RageException_D3DNoPalettedAlpha: public exception
{
const char *what() { return
"Your video card doesn'thardware acceleration is not available. "
"Please obtain an updated driver from your video card manufacturer.\n\n"; }
};
class RageException_D3DNotInstalled: public exception { };
class RageException_D3DNoAcceleration: public exception { };
class RageDisplay_D3D: public RageDisplay
stepmania/src/StepMania.cpp
+7 -3
View File
@@ -267,6 +267,8 @@ static void CheckSettings()
#include "archutils/Win32/VideoDriverInfo.h"
#include "regex.h"
static const CString D3DURL = "http://search.microsoft.com/gomsuri.asp?n=1&c=rp_BestBets&siteid=us&target=http://www.microsoft.com/downloads/details.aspx?FamilyID=a19bed22-0b25-4e5d-a584-6389d8a3dad0&displaylang=en";
RageDisplay *CreateDisplay()
{
/* We never want to bother users with having to decide which API to use.
@@ -393,9 +395,11 @@ RageDisplay *CreateDisplay()
error += "Initializing Direct3D...\n";
try {
return new RageDisplay_D3D( params );
} catch(exception e) {
error += e.what();
error += "\n\n";
} catch(RageException_D3DNotInstalled e) {
error += "DirectX 8.1 or greater is not installed. You can download it from:\n"+D3DURL+"\n\n";
} catch(RageException_D3DNoAcceleration e) {
error += "Your system is reporting that Direct3D hardware acceleration is not available. "
"Please obtain an updated driver from your video card manufacturer.\n\n";
};
#endif
}