SDL loading window crashes Xbox version. Use null loading window til an
Xbox version is written.
This commit is contained in:
@@ -12,6 +12,12 @@
|
|||||||
|
|
||||||
LoadingWindow *MakeLoadingWindow()
|
LoadingWindow *MakeLoadingWindow()
|
||||||
{
|
{
|
||||||
|
#if defined(XBOX)
|
||||||
|
/* Using the SDL loading window without the SDLmain library causes the Xbox version
|
||||||
|
* to crash, so we'll use the Null loading window until an Xbox loading window is written */
|
||||||
|
return new LoadingWindow_Null;
|
||||||
|
#endif
|
||||||
|
|
||||||
if( !PREFSMAN->m_bShowLoadingWindow )
|
if( !PREFSMAN->m_bShowLoadingWindow )
|
||||||
return new LoadingWindow_Null;
|
return new LoadingWindow_Null;
|
||||||
|
|
||||||
|
|||||||
@@ -3,23 +3,19 @@
|
|||||||
|
|
||||||
/* Load drivers for Xbox. */
|
/* Load drivers for Xbox. */
|
||||||
|
|
||||||
#include "LoadingWindow/LoadingWindow_SDL.h"
|
/* Using the SDL loading window without loading the SDLmain library causes a crash
|
||||||
|
* so we'll use Null for now */
|
||||||
|
//#include "LoadingWindow/LoadingWindow_SDL.h"
|
||||||
|
#include "LoadingWindow/LoadingWindow_Null.h"
|
||||||
|
|
||||||
#include "ArchHooks/ArchHooks_Xbox.h"
|
#include "ArchHooks/ArchHooks_Xbox.h"
|
||||||
|
|
||||||
#include "InputHandler/InputHandler_Xbox.h"
|
#include "InputHandler/InputHandler_Xbox.h"
|
||||||
|
|
||||||
/* Err, is SDL input working on Xbox? arch_default comments indicated no.
|
|
||||||
* (Best to use a custom driver for threaded input, anyway.) */
|
|
||||||
/* I believe it is working, and it's the only thing we depend on SDL for.
|
|
||||||
* I'll write an InputHandler so we can ditch the SDLXbox mess. -Chris */
|
|
||||||
#include "InputHandler/InputHandler_SDL.h"
|
|
||||||
|
|
||||||
|
|
||||||
#include "Sound/RageSoundDriver_DSound.h"
|
#include "Sound/RageSoundDriver_DSound.h"
|
||||||
|
|
||||||
/* Undef this if you need no SDL input. */
|
/* Undef this if you need no SDL input. */
|
||||||
// #undef SUPPORT_SDL_INPUT
|
#undef SUPPORT_SDL_INPUT
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user