1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-10-05 05:42:18 +00:00

Fixes for Linux

- 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
commit 1ab32b585f
4 changed files with 8 additions and 16 deletions

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;