Merge pull request #707 from JerwuQu/jwq_bugfix-bonanza

Issue squashing

Author: aduros

cli/cli.js

@@ -10,6 +10,9 @@ const langOption = new Option("--lang <lang>", "Use the given language")
     .choices(LANGS);
 
 function requireLang (opts) {
+    if (opts.lang) {
+        return opts.lang;
+    }
     if (opts.surpriseMe) {
         return LANGS[(Math.random()*LANGS.length) >>> 0];
     }

runtimes/web/src/constants.ts

@@ -1,7 +1,4 @@
-// If you update this definition, make sure to also update the definition
-// in vite.config.ts to match.
-export const GAMEDEV_MODE: boolean = import.meta.env.VITE_WASM4_GAMEDEV_MODE !== "false";
-
+export const GAMEDEV_MODE = WASM4_GAMEDEV_MODE;
 export const WIDTH = 160;
 export const HEIGHT = 160;
 

runtimes/web/src/ui/menu-overlay.ts

@@ -65,6 +65,11 @@ export class MenuOverlay extends LitElement {
             background: rgba(0, 0, 0, 0.85);
         }
 
+        .version {
+            color: #fff;
+            padding-bottom: 1em;
+        }
+
         .menu {
             border: 2px solid #f0f0f0;
             padding: 0 1em 0 1em;
@@ -244,6 +249,9 @@ export class MenuOverlay extends LitElement {
 
     render () {
         return html`
+            <div class="version">
+                WASM-4 v${WASM4_VERSION}
+            </div>
             <div class="menu">
                 <ul style="display:${this.optionContext === optionContext.DEFAULT? "inherit": "none"}">
                     ${map(options[optionContext.DEFAULT], (option, idx) =>

runtimes/web/src/vite-env.d.ts

@@ -1,6 +1,5 @@
 // Include the types for Vite's special import.meta.env object.
 /// <reference types="vite/client" />
 
-interface ImportMetaEnv {
-    readonly VITE_WASM4_GAMEDEV_MODE: string
-}
+declare const WASM4_VERSION: string
+declare const WASM4_GAMEDEV_MODE: boolean

runtimes/web/vite.config.ts

@@ -1,15 +1,10 @@
 import { UserConfig, defineConfig } from 'vite';
 import minifyHTML from 'rollup-plugin-minify-html-literals-v3';
-
-function isGamedevBuild(): boolean {
-  // If you update this definition, make sure to also update the definition
-  // in src/constants.ts to match.
-  return process.env.VITE_WASM4_GAMEDEV_MODE !== "false";
-}
+import cliPackageJSON from '../../cli/package.json';
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => {
-  const gamedev_build = isGamedevBuild();
+  const gamedev_build = process.env.VITE_WASM4_GAMEDEV_MODE !== "false";
 
   let user_config: UserConfig = {
     server: {
@@ -46,6 +41,10 @@ export default defineConfig(({ mode }) => {
     plugins: [
         minifyHTML(),
     ],
+    define: {
+      WASM4_GAMEDEV_MODE: gamedev_build,
+      WASM4_VERSION: JSON.stringify(cliPackageJSON.version),
+    },
   };
 
   return user_config;

site/docs/guides/user-input.md

@@ -404,8 +404,8 @@ export fn update() void {
 
 ## Mouse
 
-Mouse (or touchscreen) input is supported. See the [Memory Map](/docs/reference/memory)
-reference for more details on `MOUSE_X`, `MOUSE_Y`, and `MOUSE_BUTTONS`.
+Mouse (or touchscreen) input is supported and will work for positions even outside of the game window on supported platforms.
+See the [Memory Map](/docs/reference/memory) reference for more details on `MOUSE_X`, `MOUSE_Y`, and `MOUSE_BUTTONS`.
 
 On the example below, we can make a rectangle follow the mouse position and expand when clicked:
 

site/docs/reference/functions.md

@@ -91,6 +91,10 @@ By default, `str` is expected to be a `\0` terminated ASCII string.
 This means bytes `0x80-0xFF` are treated as individual characters, even in programming languages where strings are normally UTF-8 encoded.
 No terminating `\0` is needed in those languages.
 In languages where all strings are UTF-16, `str` must only contain characters up to U+00FF and no `\0` is needed.
+
+The text drawing functions in WASM-4's internals and bindings are called `textUtf8` and `textUtf16` for UTF-8 and UTF-16 respectively,
+but these names are misnomers and don't actually use UTF-8 or UTF-16 encodings.
+If you encounter these functions, instead treat them according to the explanation above.
 :::
 
 ## Sound

site/docs/reference/memory.md

@@ -82,11 +82,11 @@ Example:
 
 ### MOUSE_X
 
-Signed 16 bit integer containing the X position of the mouse.
+Signed 16 bit integer containing the X position of the mouse. Can contain positions outside of the game window.
 
 ### MOUSE_Y
 
-Signed 16 bit integer containing the Y position of the mouse.
+Signed 16 bit integer containing the Y position of the mouse. Can contain positions outside of the game window.
 
 ### MOUSE_BUTTONS