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

Fix naming

Browse source
This commit is contained in:
techmetx11 2025-02-19 17:34:34 +01:00 committed by tildearrow
parent 308aacc1e6
commit 56937d8f05
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/engine/fileOps/tfm.cpp
View file

@ -193,7 +193,7 @@ struct TFMParsePatternInfo {
DivSong* ds; DivSong* ds;
int* insNumMaps; int* insNumMaps;
bool v2; bool v2;
unsigned char loop_pos; unsigned char loopPos;
}; };
void TFMParsePattern(struct TFMParsePatternInfo info) { void TFMParsePattern(struct TFMParsePatternInfo info) {
@ -510,7 +510,7 @@ void TFMParsePattern(struct TFMParsePatternInfo info) {
chVolumeSlide[j]=true; chVolumeSlide[j]=true;
break; break;
default: default:
break; break;
} }
} }
} }
@ -518,25 +518,25 @@ void TFMParsePattern(struct TFMParsePatternInfo info) {
} }
if (lastPatSeen>1) { if (lastPatSeen>1) {
// clone the last pattern // clone the last pattern
info.maxPat++; info.maxPat++;
for (int i=0;i<6;i++) { for (int i=0;i<6;i++) {
int last_pat_num = info.ds->subsong[0]->orders.ord[i][info.ds->subsong[0]->ordersLen - 1]; int lastPatNum = info.ds->subsong[0]->orders.ord[i][info.ds->subsong[0]->ordersLen - 1];
DivPattern* new_pat = new DivPattern; DivPattern* newPat = new DivPattern;
DivPattern* last_pat = info.ds->subsong[0]->pat[i].data[last_pat_num]; DivPattern* lastPat = info.ds->subsong[0]->pat[i].data[lastPatNum];
last_pat->copyOn(new_pat); lastPat->copyOn(newPat);
info.ds->subsong[0]->orders.ord[i][info.ds->subsong[0]->ordersLen - 1] = info.maxPat; info.ds->subsong[0]->orders.ord[i][info.ds->subsong[0]->ordersLen - 1] = info.maxPat;
new_pat->data[info.patLens[last_pat_num]-1][4+(usedEffectsCol*4)] = 0x0B; newPat->data[info.patLens[lastPatNum]-1][4+(usedEffectsCol*4)] = 0x0B;
new_pat->data[info.patLens[last_pat_num]-1][5+(usedEffectsCol*4)] = info.loop_pos; newPat->data[info.patLens[lastPatNum]-1][5+(usedEffectsCol*4)] = info.loopPos;
info.ds->subsong[0]->pat[i].data[info.maxPat] = new_pat; info.ds->subsong[0]->pat[i].data[info.maxPat] = newPat;
} }
} else { } else {
for (int i=0;i<6;i++) { for (int i=0;i<6;i++) {
int last_pat_num = info.ds->subsong[0]->orders.ord[i][info.ds->subsong[0]->ordersLen - 1]; int lastPatNum = info.ds->subsong[0]->orders.ord[i][info.ds->subsong[0]->ordersLen - 1];
DivPattern* last_pat = info.ds->subsong[0]->pat[i].data[last_pat_num]; DivPattern* lastPat = info.ds->subsong[0]->pat[i].data[lastPatNum];
last_pat->data[info.patLens[last_pat_num]-1][4+(usedEffectsCol*4)] = 0x0B; lastPat->data[info.patLens[lastPatNum]-1][4+(usedEffectsCol*4)] = 0x0B;
last_pat->data[info.patLens[last_pat_num]-1][5+(usedEffectsCol*4)] = info.loop_pos; lastPat->data[info.patLens[lastPatNum]-1][5+(usedEffectsCol*4)] = info.loopPos;
} }
} }
} }
@ -578,8 +578,8 @@ bool DivEngine::loadTFMv1(unsigned char* file, size_t len) {
} }
ds.subsong[0]->ordersLen=reader.readCNoRLE(); ds.subsong[0]->ordersLen=reader.readCNoRLE();
// order loop position, unused // order loop position
unsigned char loop_pos = reader.readCNoRLE(); unsigned char loopPos = reader.readCNoRLE();
ds.createdDate=TFMparseDate(reader.readSNoRLE()); ds.createdDate=TFMparseDate(reader.readSNoRLE());
ds.revisionDate=TFMparseDate(reader.readSNoRLE()); ds.revisionDate=TFMparseDate(reader.readSNoRLE());
@ -705,7 +705,7 @@ bool DivEngine::loadTFMv1(unsigned char* file, size_t len) {
info.patLens=patLens; info.patLens=patLens;
info.reader=&reader; info.reader=&reader;
info.v2=false; info.v2=false;
info.loop_pos=loop_pos; info.loopPos=loopPos;
TFMParsePattern(info); TFMParsePattern(info);
if (active) quitDispatch(); if (active) quitDispatch();
@ -778,8 +778,8 @@ bool DivEngine::loadTFMv2(unsigned char* file, size_t len) {
} }
ds.subsong[0]->ordersLen=reader.readCNoRLE(); ds.subsong[0]->ordersLen=reader.readCNoRLE();
// order loop position, unused // order loop position
unsigned char loop_pos = reader.readCNoRLE(); unsigned char loopPos = reader.readCNoRLE();
ds.createdDate=TFMparseDate(reader.readSNoRLE()); ds.createdDate=TFMparseDate(reader.readSNoRLE());
ds.revisionDate=TFMparseDate(reader.readSNoRLE()); ds.revisionDate=TFMparseDate(reader.readSNoRLE());
@ -905,7 +905,7 @@ bool DivEngine::loadTFMv2(unsigned char* file, size_t len) {
info.patLens=patLens; info.patLens=patLens;
info.reader=&reader; info.reader=&reader;
info.v2=true; info.v2=true;
info.loop_pos=loop_pos; info.loopPos=loopPos;
TFMParsePattern(info); TFMParsePattern(info);
if (active) quitDispatch(); if (active) quitDispatch();
@ -930,7 +930,7 @@ bool DivEngine::loadTFMv2(unsigned char* file, size_t len) {
} catch(InvalidHeaderException& e) { } catch(InvalidHeaderException& e) {
lastError="invalid info header!"; lastError="invalid info header!";
} }
delete[] file; delete[] file;
return success; return success;
} }