mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-12-24 13:45:47 +00:00
Code Issues Releases Wiki Activity

Fixes for Linux

Browse source 
- fixed warning about PlaySfx::handle
- fixed displaying subtitles - if the path was not full lowercase it didn't find its txt files.
- CMake: removed SDLMAIN_FOUND, which is seemingly only defined on windows and does more harm than good.
- glpng: always use new libpng API (fixes windows build)
This commit is contained in:
fgenesis 2012-01-10 19:34:31 +01:00
parent 2d795b5bf7
commit 1ab32b585f
4 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Aquaria/SubtitlePlayer.cpp
View file

@ -46,7 +46,7 @@ void SubtitlePlayer::go(const std::string &subs)
if (dsq->mod.isActive())
{
f = dsq->mod.getPath() + "audio/" + subs + ".txt";
stringToLower(f);
f = core->adjustFilenameCase(f);
if (exists(f))
checkAfter = false;
}
@ -54,7 +54,7 @@ void SubtitlePlayer::go(const std::string &subs)
if (checkAfter)
{
f = "scripts/vox/" + subs + ".txt";
stringToLower(f);
f = core->adjustFilenameCase(f);
if (!exists(f))
{
debugLog("Could not find subs file [" + subs + "]");

8
BBGE/SoundManager.h
View file

@ -105,7 +105,7 @@ struct PlaySfx
PlaySfx() : priority(0.5), handle(0), pan(0), vol(1), fade(SFT_NONE), time(0), freq(1), loops(0), channel(BBGE_AUDIO_NOCHANNEL) {}
std::string name;
int handle;
intptr_t handle;
float pan;
float vol;
float time;
@ -129,7 +129,7 @@ public:
void loadSoundCache(const std::string &spath="sfx/cache/", const std::string &ftype=".ogg", void progressCallback()=NULL);
void stopAllSfx();
void clearLocalSounds();
void setVoicePath2(const std::string &voicePath2) { this->voicePath2 = voicePath2; }
@ -217,7 +217,7 @@ public:
bool enabled;
bool checkError();
void error(const std::string &errMsg);
EventPtr event_playVoice, event_stopVoice;
@ -234,7 +234,7 @@ public:
std::string reverbKeyword;
private:
std::string voicePath2;
float overrideVoiceFader;

4
CMakeLists.txt
View file

@ -148,7 +148,7 @@ OPTION(AQUARIA_INTERNAL_SDL "Always use included SDL library" FALSE)
if(NOT AQUARIA_INTERNAL_SDL)
find_package(SDL)
endif(NOT AQUARIA_INTERNAL_SDL)
if(NOT SDL_FOUND OR ((MACOSX OR WIN32) AND (NOT SDLMAIN_FOUND)))
if(NOT SDL_FOUND)
if(MACOSX)
set(SDLDIR "${EXTLIBDIR}/SDL12")
set(SDL_INCLUDE_DIR "${SDLDIR}/include")
@ -164,7 +164,7 @@ if(NOT SDL_FOUND OR ((MACOSX OR WIN32) AND (NOT SDLMAIN_FOUND)))
else(MACOSX)
message(SEND_ERROR "We don't have a prebuilt SDL for this platform.")
endif(MACOSX)
endif(NOT SDL_FOUND OR ((MACOSX OR WIN32) AND (NOT SDLMAIN_FOUND)))
endif(NOT SDL_FOUND)
### OpenAL

8
ExternalLibs/glpng/glpng.c
View file

@ -277,11 +277,7 @@ int APIENTRY pngLoadRawF(FILE *fp, pngRawInfo *pinfo) {
endinfo = png_create_info_struct(png);
// DH: added following lines
#ifdef LIBPNG_NEW_API
if (setjmp(png_jmpbuf(png)))
#else
if (setjmp(png->jmpbuf))
#endif
{
png_destroy_read_struct(&png, &info, &endinfo);
return 0;
@ -385,11 +381,7 @@ int APIENTRY pngLoadF(FILE *fp, int mipmap, int trans, pngInfo *pinfo) {
endinfo = png_create_info_struct(png);
// DH: added following lines
#ifdef LIBPNG_NEW_API
if (setjmp(png_jmpbuf(png)))
#else
if (setjmp(png->jmpbuf))
#endif
{
png_destroy_read_struct(&png, &info, &endinfo);
return 0;