mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-07-03 14:34:34 +00:00
Code Issues Releases Wiki Activity

Fix build with gcc ~5.4. Thx thegamemaster1234 for pointing.

Browse source
This commit is contained in:
fgenesis 2016-10-03 22:28:11 +02:00
parent b5e6234269
commit bc77c89ad3
9 changed files with 33 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
BBGE/ParticleManager.cpp
View file

@ -294,7 +294,7 @@ Particle *ParticleManager::getFreeParticle(Emitter *emitter)
return p;
}
void loadParticleCallback(const std::string &filename, intptr_t param)
void loadParticleCallback(const std::string &filename, void *param)
{
ParticleEffect *e = new ParticleEffect();
@ -313,12 +313,12 @@ void ParticleManager::loadParticleBank(const std::string &bank1, const std::stri
clearParticleBank();
particleBankPath = bank1;
forEachFile(bank1, ".txt", loadParticleCallback, 0);
forEachFile(bank1, ".txt", loadParticleCallback);
if (!bank2.empty())
{
particleBankPath = bank2;
forEachFile(bank2, ".txt", loadParticleCallback, 0);
forEachFile(bank2, ".txt", loadParticleCallback);
}
particleBankPath = "";