v1.13-WIP

chg: updated zxdb to latest (1.0.215)
fix: fix zxdb2txt tool build (shell32.lib)
fix: vs2019 build

Author: r-lyeh

MAKE.bat

@@ -251,7 +251,7 @@ ping -n 2 -w 1500 localhost > nul && rem wait 1s between 2 consecutive pings, so
 where /q rcedit-x64 || curl -LO https://github.com/electron/rcedit/releases/download/v2.0.0/rcedit-x64.exe
 where /q rcedit-x64 && ^
 rcedit-x64 "Spectral.exe" --set-file-version "!year!.!month!.!today!.!today!!month!" && ^
-rcedit-x64 "Spectral.exe" --set-product-version "1.12 Spectral" && ^
+rcedit-x64 "Spectral.exe" --set-product-version "1.13-WIP Spectral" && ^
 rcedit-x64 "Spectral.exe" --set-icon src\res\img\noto_1f47b.ico || goto error
 
 if "%__DOTNET_PREFERRED_BITNESS%"=="32" (

src/3rd_tigr.h

@@ -535,7 +535,7 @@ int tigrGAPIBegin(Tigr* bmp);
 int tigrGAPIEnd(Tigr* bmp);
 void tigrGAPIPresent(Tigr* bmp, int w, int h);
 
-#if __has_include("3rd_tigrdragndrop.h")
+#if defined(__has_include) && __has_include("3rd_tigrdragndrop.h")
 #include "3rd_tigrdragndrop.h" //< @r-lyeh
 #endif
 
@@ -2626,7 +2626,9 @@ LRESULT CALLBACK tigrWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPar
         win = tigrInternal(bmp);
 
     switch (message) {
+#if defined(__has_include) && __has_include("3rd_tigrdragndrop.h")
         TIGR_HANDLE_DRAG_N_DROP(hWnd, wParam) // @r-lyeh
+#endif
 
         case WM_PAINT:
             if (!tigrGAPIBegin(bmp)) {

src/app.c

@@ -235,7 +235,7 @@
 // [ ] XL1 (Compilation)
 #endif
 
-#define SPECTRAL "v1.12"
+#define SPECTRAL "v1.13-WIP"
 
 #ifndef DEV
 #if NDEBUG >= 2
@@ -1271,9 +1271,9 @@ void draw_ui() {
             ui_dialog_separator();
             ui_dialog_separator();
 
-            ui_dialog_checkbox2(&ZX_RF,"<RF mode (extra CPU cost)\n","- Enable RF mode -",app_apply_shader);
-            ui_dialog_checkbox2(&ZX_CRT,"<CRT shader\n","- Enable CRT mode -",app_apply_shader);
-            ui_dialog_checkbox2(&ZX_SHADED,"<External shader ","- Use external shader -",app_apply_shader);
+            ui_dialog_checkbox2(&ZX_RF,"<RF mode (extra CPU cost)\n","- Enable RF mode -",(void*)app_apply_shader);
+            ui_dialog_checkbox2(&ZX_CRT,"<CRT shader\n","- Enable CRT mode -",(void*)app_apply_shader);
+            ui_dialog_checkbox2(&ZX_SHADED,"<External shader ","- Use external shader -",(void*)app_apply_shader);
             ui_dialog_option(1|4,FOLDER_STR"\n\n","- Browse external .fx shader -",'SHAD',NULL);
 
             ui_dialog_ok();
@@ -2475,7 +2475,7 @@ if( do_runahead == 0 ) {
             break; case 'LENS':  ZX_LENSLOK ^= 1;                                 if(cmdarg_) ZX_LENSLOK=atoi(cmdarg_);
             break; case 'BLUR':  ZX_BLUR = (ZX_BLUR+10)%100;                      if(cmdarg_) ZX_BLUR=atoi(cmdarg_)%100;
             break; case 'BLUM':  ZX_BLOOM = (ZX_BLOOM+10)%100;                    if(cmdarg_) ZX_BLOOM=atoi(cmdarg_)%100;
-            break; case 'PALB':  { const char *file = app_loadfile(); if( file && strendi(file, ".pal") ) if( pal_load(file) ) palette_use(ZX_PALETTE = countof(ZXPaletteNames) - 1), cmdkey = 'PAL0'; }
+            break; case 'PALB':  { const char *file = app_loadfile(); if( file && strendi(file, ".pal") ) if( pal_load(file) ) palette_use(ZX_PALETTE = countof(ZXPalettes) - 1), cmdkey = 'PAL0'; }
             break; case 'PAL':   ZX_PALETTE = (ZX_PALETTE+1)%countof(ZXPalettes); if(cmdarg_) ZX_PALETTE=atoi(cmdarg_);    palette_use(ZX_PALETTE);
             break; case 'PALP':  ZX_PALETTE_PREVIEW ^= 1;                         if(cmdarg_) ZX_PALETTE_PREVIEW=(ZX_PALETTE_PREVIEW * (cmdarg_[0] == '^')) ^ atoi(cmdarg_ + !isdigit(cmdarg_[0]));
             break; case 'FIRE':  ZX_AUTOFIRE = (ZX_AUTOFIRE+1)%4;                 if(cmdarg_) ZX_AUTOFIRE=atoi(cmdarg_);
@@ -2665,7 +2665,7 @@ if( do_runahead == 0 ) {
             }
 
             break; case 'PAL0':
-                if( cmdarg_ &&  strcmp(cmdarg_, "^1") ) ZX_PALETTE = atoi(cmdarg_) % countof(ZXPaletteNames);
+                if( cmdarg_ &&  strcmp(cmdarg_, "^1") ) ZX_PALETTE = atoi(cmdarg_) % countof(ZXPalettes);
                 if( cmdarg_ && !strcmp(cmdarg_, "^1") ) ZX_PALETTE_PREVIEW ^= 1;
 
                 int ext = countof(ZXPaletteNames) - 1, is_ext_loaded = !!ZXPalettes[ext][1]; // !!is_file(".Spectral/Spectral.pal");

src/res/pals/bin2c.exe

@@ -1 +1 @@
-#define ZXDB_VERSION "Version 1.0.214"
+#define ZXDB_VERSION "Version 1.0.215"

src/res/zxdb/Spectral.db.diff

@@ -11,6 +11,7 @@
 
 #ifdef _WIN32
 #include <winsock2.h>
+#pragma comment(lib, "shell32")
 #else
 #include <unistd.h>
 #endif

src/res/zxdb/Spectral.db.gz

@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
-#if defined _MSC_VER && !defined __clang__
+#if defined _MSC_VER && _MSC_VER > 1900 && !defined __clang__
 __declspec(no_sanitize_address)
 #endif
 char* tempvl(const char *fmt, va_list vl) {

src/res/zxdb/ZXDB_version.h

@@ -295,6 +295,7 @@ rgba ZXPalettes[][64] = {
     },
     {
         // external. must be last entry
+        0
     },
 };