This commit is contained in:
James Turk 2003-08-08 03:54:34 +00:00
parent bb1302dd7b
commit 8e873c5dca
2 changed files with 15 additions and 5 deletions

View File

@ -13,7 +13,7 @@
\brief Definition file for core ZEngine class. \brief Definition file for core ZEngine class.
ZEngine Game Engine core Engine definition. ZEngine Game Engine core Engine definition.
<br>$Id: ZE_ZEngine.h,v 1.46 2003/08/02 01:18:45 cozman Exp $<br> <br>$Id: ZE_ZEngine.h,v 1.47 2003/08/08 03:54:34 cozman Exp $<br>
\author James Turk \author James Turk
**/ **/
@ -161,7 +161,7 @@ class ZEngine
#ifdef USE_SDL_MIXER #ifdef USE_SDL_MIXER
/*! /*!
\brief Initialize Sound for SDL. \brief Setup Sound for SDL.
Set sound settings to specified parameters. (If not called before CreateDisplay rate will default to 22050+mono) Set sound settings to specified parameters. (If not called before CreateDisplay rate will default to 22050+mono)
@ -171,6 +171,16 @@ class ZEngine
void SetupSound(int rate, bool stereo); void SetupSound(int rate, bool stereo);
#endif #endif
#ifdef USE_SDL_IMAGE
/*!
\brief Init Sound for ZEngine.
Initialize sound for ZEngine.
**/
bool InitSound();
#endif
/*! /*!
\brief Create Display with predefined settings. \brief Create Display with predefined settings.

View File

@ -13,7 +13,7 @@
\brief Central source file for ZEngine. \brief Central source file for ZEngine.
Actual implementation of ZEngine singleton class, the core of ZEngine. Actual implementation of ZEngine singleton class, the core of ZEngine.
<br>$Id: ZE_ZEngine.cpp,v 1.55 2003/08/02 01:18:45 cozman Exp $<br> <br>$Id: ZE_ZEngine.cpp,v 1.56 2003/08/08 03:54:34 cozman Exp $<br>
\author James Turk \author James Turk
**/ **/
@ -104,7 +104,7 @@ bool ZEngine::CreateDisplay(std::string title, std::string icon)
if(Mix_OpenAudio(mRate, AUDIO_S16SYS, mStereo?2:1, 4096) < 0) //Open Audio (Stereo?2:1 is conditional for number of channels) if(Mix_OpenAudio(mRate, AUDIO_S16SYS, mStereo?2:1, 4096) < 0) //Open Audio (Stereo?2:1 is conditional for number of channels)
{ {
ReportError(ZERR_MIX_INIT,SDL_GetError()); ReportError(ZERR_MIX_INIT,SDL_GetError());
status = false; //continue setup without sound status = false;
} }
} }
#endif //USE_SDL_MIXER #endif //USE_SDL_MIXER
@ -121,7 +121,7 @@ bool ZEngine::CreateDisplay(std::string title, std::string icon)
else //this decides correcr BPP else //this decides correcr BPP
{ {
if(mBPP == -1) if(mBPP == -1)
mBPP = SDL_GetVideoInfo()->vfmt->BitsPerPixel; mBPP = SDL_GetVideoInfo()->vfmt->BitsPerPixel; //try desktop resolution
bpp = SDL_VideoModeOK(mWidth, mHeight, mBPP, flags); bpp = SDL_VideoModeOK(mWidth, mHeight, mBPP, flags);
if(!bpp) if(!bpp)