etc
/
furnace
mirror of https://github.com/tildearrow/furnace.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MOD import: crash fix

This commit is contained in:
tildearrow 2022-03-14 17:16:43 -05:00
parent d7b967c41e
commit 8012676993
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/engine/engine.h
View File

@ -40,6 +40,9 @@
#define DIV_VERSION "dev66"
#define DIV_ENGINE_VERSION 66
// for imports
#define DIV_VERSION_MOD 0xff01
enum DivStatusView {
DIV_STATUS_NOTHING=0,
DIV_STATUS_PATTERN,

12
src/engine/fileOps.cpp
View File

@ -1241,6 +1241,7 @@ bool DivEngine::loadMod(unsigned char* file, size_t len) {
try {
DivSong ds;
ds.tuning=436.0;
ds.version=DIV_VERSION_MOD;
// check mod magic bytes
if (!reader.seek(1080,SEEK_SET)) {
@ -1255,6 +1256,7 @@ bool DivEngine::loadMod(unsigned char* file, size_t len) {
&&(magic[0]>='1' && magic[0]<='9' && magic[1]>='0' && magic[1]<='9')) {
chCount=((magic[0]-'0')*10)+(magic[1]-'0');
} else {
// TODO: Soundtracker MOD?
throw InvalidHeaderException();
}
// song name
@ -1266,7 +1268,7 @@ bool DivEngine::loadMod(unsigned char* file, size_t len) {
DivSample* sample=new DivSample;
sample->depth=8;
sample->name=reader.readString(22);
int slen=reader.readS_BE()*2;
int slen=((unsigned short)reader.readS_BE())*2;
sampLens[i]=slen;
if (slen==2) slen=0;
signed char fineTune=reader.readC()&0x0f;
@ -1504,20 +1506,20 @@ bool DivEngine::loadMod(unsigned char* file, size_t len) {
ds.hz=50;
ds.customTempo=false;
ds.systemLen=(chCount+3)/4;
for(int i=0;i<ds.systemLen;i++) {
for(int i=0; i<ds.systemLen; i++) {
ds.system[i]=DIV_SYSTEM_AMIGA;
ds.systemFlags[i]=1; // PAL
}
for(int i=0;i<chCount;i++) {
for(int i=0; i<chCount; i++) {
ds.chanShow[i]=true;
}
for(int i=chCount;i<ds.systemLen*4;i++) {
for(int i=chCount; i<ds.systemLen*4; i++) {
ds.pat[i].effectRows=1;
ds.chanShow[i]=false;
}
// instrument creation
ds.insLen=31;
for(int i=0;i<31;i++) {
for(int i=0; i<31; i++) {
DivInstrument* ins=new DivInstrument;
ins->type=DIV_INS_AMIGA;
ins->amiga.initSample=i;

4
src/gui/gui.cpp
View File

@ -3682,7 +3682,7 @@ void FurnaceGUI::doAction(int what) {
}
break;
case GUI_ACTION_SAVE:
if (curFileName=="") {
if (curFileName=="" || e->song.version>=0xff00) {
openFileDialog(GUI_FILE_SAVE);
} else {
if (save(curFileName,e->song.isDMF?e->song.version:0)>0) {
@ -5438,7 +5438,7 @@ bool FurnaceGUI::loop() {
}
ImGui::Separator();
if (ImGui::MenuItem("save",BIND_FOR(GUI_ACTION_SAVE))) {
if (curFileName=="") {
if (curFileName=="" || e->song.version>=0xff00) {
openFileDialog(GUI_FILE_SAVE);
} else {
if (save(curFileName,e->song.isDMF?e->song.version:0)>0) {