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

changes

Browse source
This commit is contained in:
tildearrow 2024-08-17 16:29:13 -05:00
parent f5743da6e8
commit 636a9921a2
6 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/engine/engine.h
View file

@ -597,7 +597,7 @@ class DivEngine {
bool loadDMF(unsigned char* file, size_t len);
bool loadFur(unsigned char* file, size_t len, int variantID=0);
bool loadMod(unsigned char* file, size_t len);
bool loadS3M(unsigned char* file, size_t len, bool opl2=false);
bool loadS3M(unsigned char* file, size_t len);
bool loadXM(unsigned char* file, size_t len);
bool loadIT(unsigned char* file, size_t len);
bool loadFTM(unsigned char* file, size_t len, bool dnft, bool dnftSig, bool eft);
@ -689,7 +689,7 @@ class DivEngine {
void createNew(const char* description, String sysName, bool inBase64=true);
void createNewFromDefaults();
// load a file.
bool load(unsigned char* f, size_t length, const char* nameHint=NULL, bool s3mOPL2=false);
bool load(unsigned char* f, size_t length, const char* nameHint=NULL);
// play a binary command stream.
bool playStream(unsigned char* f, size_t length);
// get the playing stream.

4
src/engine/fileOps/fileOpsCommon.cpp
View file

@ -19,7 +19,7 @@
#include "fileOpsCommon.h"
bool DivEngine::load(unsigned char* f, size_t slen, const char* nameHint, bool s3mOPL2) {
bool DivEngine::load(unsigned char* f, size_t slen, const char* nameHint) {
unsigned char* file;
size_t len;
if (slen<21) {
@ -158,7 +158,7 @@ bool DivEngine::load(unsigned char* f, size_t slen, const char* nameHint, bool s
return loadIT(file,len);
} else if (len>=48) {
if (memcmp(&file[0x2c],DIV_S3M_MAGIC,4)==0) {
return loadS3M(file,len,s3mOPL2);
return loadS3M(file,len);
} else if (memcmp(file,DIV_XM_MAGIC,17)==0) {
return loadXM(file,len);
}

3
src/engine/fileOps/s3m.cpp
View file

@ -48,9 +48,10 @@ static void readSbiOpData(sbi_t& sbi, SafeReader& reader) {
sbi.FeedConnect = reader.readC();
}
bool DivEngine::loadS3M(unsigned char* file, size_t len, bool opl2) {
bool DivEngine::loadS3M(unsigned char* file, size_t len) {
struct InvalidHeaderException {};
bool success=false;
bool opl2=!getConfInt("s3mOPL3",0);
char magic[4]={0,0,0,0};
SafeReader reader=SafeReader(file,len);
warnings="";