mirror of
https://github.com/AquariaOSE/Aquaria.git
synced 2025-08-07 06:40:22 +00:00
Fix particle & shot loading on linux (fix file name case)
This commit is contained in:
parent
4891fcc339
commit
25e228d3ca
2 changed files with 6 additions and 3 deletions
|
@ -64,7 +64,7 @@ ShotData::ShotData()
|
||||||
ignoreShield = false;
|
ignoreShield = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void readEquals2(std::ifstream &in)
|
template <typename T> void readEquals2(T &in)
|
||||||
{
|
{
|
||||||
std::string temp;
|
std::string temp;
|
||||||
in >> temp;
|
in >> temp;
|
||||||
|
@ -93,7 +93,10 @@ void ShotData::bankLoad(const std::string &file, const std::string &path)
|
||||||
}
|
}
|
||||||
|
|
||||||
debugLog(usef);
|
debugLog(usef);
|
||||||
std::ifstream inf(usef.c_str());
|
char *data = readFile(core->adjustFilenameCase(usef).c_str());
|
||||||
|
if (!data)
|
||||||
|
return;
|
||||||
|
SimpleIStringStream inf(data, SimpleIStringStream::TAKE_OVER);
|
||||||
std::string token;
|
std::string token;
|
||||||
while (inf >> token)
|
while (inf >> token)
|
||||||
{
|
{
|
||||||
|
@ -241,7 +244,6 @@ void ShotData::bankLoad(const std::string &file, const std::string &path)
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
inf.close();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Shot::fire(bool playSfx)
|
void Shot::fire(bool playSfx)
|
||||||
|
|
|
@ -96,6 +96,7 @@ void ParticleEffect::bankLoad(const std::string &file, const std::string &path)
|
||||||
|
|
||||||
clearEmitters();
|
clearEmitters();
|
||||||
|
|
||||||
|
usef = core->adjustFilenameCase(usef);
|
||||||
debugLog(usef);
|
debugLog(usef);
|
||||||
char *buffer = readFile(usef);
|
char *buffer = readFile(usef);
|
||||||
if (!buffer)
|
if (!buffer)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue