zeta 1.2.0

Author: asiekierka

src/frontend_posix.c

@@ -47,7 +47,7 @@ static int posix_vfs_exists(const char *filename) {
 }
 
 static void posix_zzt_help(int argc, char **argv) {
-	char *owner = (argv > 0 && argv[0] != NULL && strlen(argv[0]) > 0) ? argv[0] : "zeta";
+	char *owner = (argc > 0 && argv[0] != NULL && strlen(argv[0]) > 0) ? argv[0] : "zeta";
 
 	fprintf(stderr, "Usage: %s [arguments] [world file]\n", owner);
 	fprintf(stderr, "\n");
@@ -219,7 +219,7 @@ static int posix_zzt_init(int argc, char **argv) {
 				break;
 #endif
 			case '?':
-				fprintf(stderr, "Could not parse options! Try %s -h for help.\n", argv > 0 ? argv[0] : "running with");
+				fprintf(stderr, "Could not parse options! Try %s -h for help.\n", argc > 0 ? argv[0] : "running with");
 				exit(0);
 				return INIT_ERR_GENERIC;
 		}

src/zzt.c

@@ -854,12 +854,14 @@ static void cpu_func_intr_0x10(cpu_state* cpu) {
 				} return;
 				case 0x01:
 				case 0x11: {
-					zzt_load_charset(8, 14, res_8x14_bin, true);
+				        if (zzt_get_style() == ZZT_STYLE_DEFAULT)
+						zzt_load_charset(8, 14, res_8x14_bin, true);
 					zzt.requested_char_height = 14;
 				} return;
 				case 0x02:
 				case 0x12: {
-					zzt_load_charset(8, 8, res_8x8_bin, true);
+				        if (zzt_get_style() == ZZT_STYLE_DEFAULT)
+						zzt_load_charset(8, 8, res_8x8_bin, true);
 					zzt.requested_char_height = 8;
 				} return;
 				case 0x30: {

src/zzt_ems.c

@@ -51,7 +51,6 @@ static ems_status ems_resize_handles(ems_state *ems, u16 new_size) {
         old_handles = ems->handles;
         ems->handles = realloc(old_handles, sizeof(ems_handle) * new_size);
         if (ems->handles == NULL) {
-            ems->handles = old_handles;
             return EMS_STATUS_OUT_OF_HANDLES;
         }
     }
@@ -134,7 +133,6 @@ static ems_status ems_map_page(cpu_state *cpu, ems_state *ems, u8 physical_page,
                 phys_data = ems->handles[handle].data;
                 ems->handles[handle].data = realloc(phys_data, sizeof(u8) * (logical_page + 1) * EMS_PAGE_SIZE);
                 if (ems->handles[handle].data == NULL) {
-                    ems->handles[handle].data = phys_data;
                     return EMS_STATUS_INTERNAL_ERROR;
                 }
             }

web/package.json

@@ -6,19 +6,22 @@
   "scripts": {
     "build": "node_modules/.bin/rollup -c --bundleConfigAsCjs"
   },
-  "browserslist": ["defaults"],
+  "browserslist": [
+    "defaults"
+  ],
   "author": "asie",
   "license": "MIT",
   "devDependencies": {
-    "@babel/core": "^7.26.10",
-    "@babel/preset-env": "^7.26.9",
-    "@rollup/plugin-babel": "^6.0.4",
-    "@rollup/plugin-node-resolve": "^16.0.1",
-    "@rollup/plugin-terser": "^0.4.4",
-    "rollup": "^4.46.2",
+    "@babel/core": "^7.29.0",
+    "@babel/preset-env": "^7.29.0",
+    "@rollup/plugin-babel": "^7.0.0",
+    "@rollup/plugin-node-resolve": "^16.0.3",
+    "@rollup/plugin-terser": "^1.0.0",
+    "rollup": "^4.59.0",
     "rollup-plugin-banner2": "^1.3.1"
   },
   "dependencies": {
-    "core-js": "^3.44.0"
+    "core-js": "^3.48.0",
+    "npm-check-updates": "^19.6.3"
   }
 }

web/res/README.md

@@ -58,6 +58,7 @@ The entrypoint is "ZetaLoad(options, callback);". The callback is optional, and
       * Set to 0 to disable blinking - force low colors (can be changed back in the F11 menu).
       * Set to -1 to disable blinking - enable high colors (can be changed back by the running engine).
     * charset_override: the location of a PNG image file (16x16 chars) overriding the engine's character set, if present.
+    * style: the built-in rendering style to use: "1991", "1994", "1999", "2002"
 * audio:
     * bufferSize (buffer): the audio buffer size, in samples.
     * sampleRate (buffer): the audio sampling rate, in Hz.

web/src/emulator.js

@@ -469,6 +469,13 @@ export function createEmulator(render, audio, vfs, options) {
                 }
             }
 
+            if (options && options.render && options.render.style) {
+                 if (options.render.style == "1991") emu._zzt_set_style(1);
+                 if (options.render.style == "1994") emu._zzt_set_style(2);
+                 if (options.render.style == "1999") emu._zzt_set_style(3);
+                 if (options.render.style == "2002") emu._zzt_set_style(4);
+            }
+
             if (options && options.commands) {
                 const lastCommand = options.commands.length - 1;
                 for (var i = 0; i <= lastCommand; i++) {