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

Revert "prepare for Furnace Pro"

Browse source 
This reverts commit 6fe8bea50e.
This commit is contained in:
tildearrow 2023-04-02 02:31:37 -05:00
parent fc4397f644
commit 76deb82665
17 changed files with 163 additions and 689 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/engine/engine.cpp
View file

@ -4516,8 +4516,6 @@ void DivEngine::preInit() {
logI("Furnace version " DIV_VERSION ".");
loadConf();
if (getConfInt("seriousMode",0)) dejarteArriba=false;
}
bool DivEngine::init() {

4
src/engine/engine.h
View file

@ -53,8 +53,8 @@
#define EXTERN_BUSY_BEGIN_SOFT e->softLocked=true; e->isBusy.lock();
#define EXTERN_BUSY_END e->isBusy.unlock(); e->softLocked=false;
#define DIV_VERSION "Pro"
#define DIV_ENGINE_VERSION 146
#define DIV_VERSION "dev145"
#define DIV_ENGINE_VERSION 145
// for imports
#define DIV_VERSION_MOD 0xff01
#define DIV_VERSION_FC 0xff02

11
src/engine/fileOps.cpp
View file

@ -1642,13 +1642,6 @@ bool DivEngine::loadFur(unsigned char* file, size_t len) {
ds.version=reader.readS();
logI("module version %d (0x%.2x)",ds.version,ds.version);
if (ds.version==146 && dejarteArriba) {
logE("UNREGISTERED! register to open.");
lastError="this file was saved with an UNREGISTERED version of Furnace Pro. in order to open, you need to register.";
delete[] file;
return false;
}
if (ds.version>DIV_ENGINE_VERSION) {
logW("this module was created with a more recent version of Furnace!");
addWarning("this module was created with a more recent version of Furnace!");
@ -4839,7 +4832,7 @@ SafeWriter* DivEngine::saveFur(bool notPrimary) {
if (!notPrimary) {
song.isDMF=false;
song.version=dejarteArriba?DIV_ENGINE_VERSION:145;
song.version=DIV_ENGINE_VERSION;
}
SafeWriter* w=new SafeWriter;
@ -4849,7 +4842,7 @@ SafeWriter* DivEngine::saveFur(bool notPrimary) {
w->write(DIV_FUR_MAGIC,16);
// write version
w->writeS(dejarteArriba?DIV_ENGINE_VERSION:145);
w->writeS(DIV_ENGINE_VERSION);
// reserved
w->writeS(0);