Fix Sample#play() option bag handling

The stack indices were wrong, likely as an result of an incomplete refactoring at some point.
spheredev · Mar 11, 2024 · 35dd73d · 35dd73d
1 parent 2e27cf9
commit 35dd73d
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 neoSphere Changelog
 ===================
 
+v5.9.3 - TBD
+------------
+
+* Fixes a bug where passing an `options` object to `Sample#play()` doesn't work
+  properly and may throw an exception.
+
 v5.9.2 - December 22, 2023
 --------------------------
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.9.2
+5.9.2+
diff --git a/manpages/cell.1 b/manpages/cell.1
@@ -1,4 +1,4 @@
-.TH CELL 1 "2023-12-22" "neoSphere 5.9.2" "Sphere: the JavaScript game platform"
+.TH CELL 1 "xxxx-xx-xx" "neoSphere 5.9.2+" "Sphere: the JavaScript game platform"
 .SH NAME
 cell \- scripted build tool for Sphere game engine games
 .SH SYNOPSIS

diff --git a/manpages/neosphere.1 b/manpages/neosphere.1
@@ -1,4 +1,4 @@
-.TH NEOSPHERE 1 "2023-12-22" "neoSphere 5.9.2" "Sphere: the JavaScript game platform"
+.TH NEOSPHERE 1 "xxxx-xx-xx" "neoSphere 5.9.2+" "Sphere: the JavaScript game platform"
 .SH NAME
 neosphere \- lightweight JavaScript-powered game engine
 .SH SYNOPSIS

diff --git a/manpages/spherun.1 b/manpages/spherun.1
@@ -1,4 +1,4 @@
-.TH SPHERUN 1 "2023-12-22" "neoSphere 5.9.2" "Sphere: the JavaScript game platform"
+.TH SPHERUN 1 "xxxx-xx-xx" "neoSphere 5.9.2+" "Sphere: the JavaScript game platform"
 .SH NAME
 spherun \- run a Sphere game in a dev-friendly environment
 .SH SYNOPSIS

diff --git a/manpages/ssj.1 b/manpages/ssj.1
@@ -1,4 +1,4 @@
-.TH SSJ 1 "2023-12-22" "neoSphere 5.9.2" "Sphere: the JavaScript game platform"
+.TH SSJ 1 "xxxx-xx-xx" "neoSphere 5.9.2+" "Sphere: the JavaScript game platform"
 .SH NAME
 ssj - the JavaScript debugger for neoSphere
 .SH SYNOPSIS

diff --git a/msvs/cell.rc b/msvs/cell.rc
diff --git a/msvs/neosphere.rc b/msvs/neosphere.rc
diff --git a/msvs/ssj.rc b/msvs/ssj.rc
diff --git a/setup/neoSphereSetup.iss b/setup/neoSphereSetup.iss
@@ -33,8 +33,8 @@
 ; configurations.
 #define AppName "neoSphere"
 #define AppPublisher "Fat Cerberus"
-#define AppVersion3 "5.9.2"
-#define AppVersion4 "5.9.2.3469"
+#define AppVersion3 "5.9.2+"
+#define AppVersion4 "0.0.0.0"
 
 [Setup]
 OutputBaseFilename=neoSphereSetup-{#AppVersion3}-msw

diff --git a/src/neosphere/pegasus.c b/src/neosphere/pegasus.c
@@ -3695,10 +3695,10 @@ js_Sample_play(int num_args, bool is_ctor, intptr_t magic)
 		jsal_require_object_coercible(1);
 		jsal_get_prop_string(1, "volume");
 		if (!jsal_is_undefined(-1))
-			volume = jsal_require_number(-3);
+			volume = jsal_require_number(-1);
 		jsal_get_prop_string(1, "pan");
 		if (!jsal_is_undefined(-1))
-			pan = jsal_require_number(-2);
+			pan = jsal_require_number(-1);
 		jsal_get_prop_string(1, "speed");
 		if (!jsal_is_undefined(-1))
 			speed = jsal_require_number(-1);

diff --git a/src/shared/version.h b/src/shared/version.h
@@ -37,7 +37,7 @@
 #define SPHERE_COMPILER_NAME "Cell"
 #define SPHERE_DEBUGGER_NAME "SSj"
 
-#define SPHERE_VERSION "5.9.2"
+#define SPHERE_VERSION "5.9.2+"
 
 #define SPHERE_API_VERSION      2
 #define SPHERE_API_LEVEL        4