otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Make it work on GCC (hopefully)

Browse source
This commit is contained in:
Natt Akuma 2022-03-14 22:48:33 +07:00
parent c7fb5df206
commit 157e27eff5
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/engine/fileOps.cpp
View file

@ -1223,7 +1223,10 @@ bool DivEngine::loadFur(unsigned char* file, size_t len) {
return true; return true;
} }
bool DivEngine::loadMod(unsigned char* file, size_t len) { bool DivEngine::loadMod(unsigned char* file, size_t len) {
struct InvalidHeaderException {};
bool success=false; bool success=false;
int chCount; int chCount;
int ordCount; int ordCount;
@ -1251,7 +1254,7 @@ bool DivEngine::loadMod(unsigned char* file, size_t len) {
&&(magic[0]>='1' && magic[0]<='9' && magic[1]>='0' && magic[1]<='9')) { &&(magic[0]>='1' && magic[0]<='9' && magic[1]>='0' && magic[1]<='9')) {
chCount=((magic[0]-'0')*10)+(magic[1]-'0'); chCount=((magic[0]-'0')*10)+(magic[1]-'0');
} else { } else {
throw std::exception("invalid info header!"); throw InvalidHeaderException();
} }
// song name // song name
reader.seek(0,SEEK_SET); reader.seek(0,SEEK_SET);
@ -1288,7 +1291,7 @@ bool DivEngine::loadMod(unsigned char* file, size_t len) {
} }
// orders // orders
ds.ordersLen=ordCount=reader.readC(); ds.ordersLen=ordCount=reader.readC();
int restartPos=reader.readC(); reader.readC(); // restart position, unused
int patMax=0; int patMax=0;
for (int i=0;i<128;i++) { for (int i=0;i<128;i++) {
unsigned char pat=reader.readC(); unsigned char pat=reader.readC();
@ -1537,9 +1540,9 @@ bool DivEngine::loadMod(unsigned char* file, size_t len) {
} catch (EndOfFileException e) { } catch (EndOfFileException e) {
logE("premature end of file!\n"); logE("premature end of file!\n");
lastError="incomplete file"; lastError="incomplete file";
} catch (std::exception e) { } catch (InvalidHeaderException e) {
logE("%s\n",e.what()); logE("invalid info header!\n");
lastError=e.what(); lastError="invalid info header!";
} }
return success; return success;
} }