OPZ: fix panning effect
This commit is contained in:
commit
bcd62fc46d
|
@ -780,6 +780,8 @@ endif()
|
||||||
|
|
||||||
if(ANDROID AND NOT TERMUX)
|
if(ANDROID AND NOT TERMUX)
|
||||||
add_library(furnace SHARED ${USED_SOURCES})
|
add_library(furnace SHARED ${USED_SOURCES})
|
||||||
|
elseif(WIN32)
|
||||||
|
add_executable(furnace WIN32 ${USED_SOURCES})
|
||||||
else()
|
else()
|
||||||
add_executable(furnace ${USED_SOURCES})
|
add_executable(furnace ${USED_SOURCES})
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -1481,6 +1481,7 @@ void DivEngine::createNewFromDefaults() {
|
||||||
bool oldVol=getConfInt("configVersion",DIV_ENGINE_VERSION)<135;
|
bool oldVol=getConfInt("configVersion",DIV_ENGINE_VERSION)<135;
|
||||||
if (preset.empty()) {
|
if (preset.empty()) {
|
||||||
// try loading old preset
|
// try loading old preset
|
||||||
|
logD("trying to load old preset");
|
||||||
preset=decodeSysDesc(getConfString("initialSys",""));
|
preset=decodeSysDesc(getConfString("initialSys",""));
|
||||||
oldVol=false;
|
oldVol=false;
|
||||||
}
|
}
|
||||||
|
@ -4468,6 +4469,7 @@ bool DivEngine::init() {
|
||||||
bool oldVol=getConfInt("configVersion",DIV_ENGINE_VERSION)<135;
|
bool oldVol=getConfInt("configVersion",DIV_ENGINE_VERSION)<135;
|
||||||
if (preset.empty()) {
|
if (preset.empty()) {
|
||||||
// try loading old preset
|
// try loading old preset
|
||||||
|
logD("trying to load old preset");
|
||||||
preset=decodeSysDesc(getConfString("initialSys",""));
|
preset=decodeSysDesc(getConfString("initialSys",""));
|
||||||
oldVol=false;
|
oldVol=false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,8 +47,8 @@
|
||||||
#define BUSY_BEGIN_SOFT softLocked=true; isBusy.lock();
|
#define BUSY_BEGIN_SOFT softLocked=true; isBusy.lock();
|
||||||
#define BUSY_END isBusy.unlock(); softLocked=false;
|
#define BUSY_END isBusy.unlock(); softLocked=false;
|
||||||
|
|
||||||
#define DIV_VERSION "0.6pre4"
|
#define DIV_VERSION "0.6pre4-hotfix"
|
||||||
#define DIV_ENGINE_VERSION 143
|
#define DIV_ENGINE_VERSION 144
|
||||||
// for imports
|
// for imports
|
||||||
#define DIV_VERSION_MOD 0xff01
|
#define DIV_VERSION_MOD 0xff01
|
||||||
#define DIV_VERSION_FC 0xff02
|
#define DIV_VERSION_FC 0xff02
|
||||||
|
|
|
@ -34,6 +34,7 @@ const char* aboutLine[]={
|
||||||
"",
|
"",
|
||||||
"-- program --",
|
"-- program --",
|
||||||
"tildearrow",
|
"tildearrow",
|
||||||
|
"A M 4 N (intro tune)",
|
||||||
"akumanatt",
|
"akumanatt",
|
||||||
"cam900",
|
"cam900",
|
||||||
"djtuBIG-MaliceX",
|
"djtuBIG-MaliceX",
|
||||||
|
|
|
@ -2758,6 +2758,7 @@ void FurnaceGUI::syncSettings() {
|
||||||
settings.initialSys.set(fmt::sprintf("pan%d",i),newPan);
|
settings.initialSys.set(fmt::sprintf("pan%d",i),newPan);
|
||||||
}
|
}
|
||||||
e->setConf("initialSys2",settings.initialSys.toBase64());
|
e->setConf("initialSys2",settings.initialSys.toBase64());
|
||||||
|
e->setConf("configVersion",DIV_ENGINE_VERSION);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
12
src/main.cpp
12
src/main.cpp
|
@ -342,12 +342,14 @@ void reportError(String what) {
|
||||||
// TODO: CoInitializeEx on Windows?
|
// TODO: CoInitializeEx on Windows?
|
||||||
// TODO: add crash log
|
// TODO: add crash log
|
||||||
int main(int argc, char** argv) {
|
int main(int argc, char** argv) {
|
||||||
// Windows console thing - thanks MarioKart7z!
|
// Windows console thing - thanks dj.tuBIG/MaliceX
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
DWORD winPID;
|
|
||||||
HWND winConsole=GetConsoleWindow();
|
if (AttachConsole(ATTACH_PARENT_PROCESS)) {
|
||||||
GetWindowThreadProcessId(winConsole,&winPID);
|
freopen("CONOUT$", "w", stdout);
|
||||||
if (GetCurrentProcessId()==winPID) FreeConsole();
|
freopen("CONOUT$", "w", stderr);
|
||||||
|
freopen("CONIN$", "r", stdin);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
initLog();
|
initLog();
|
||||||
|
|
Loading…
Reference in a new issue