Ready for V 3.1.0.

Mr-Unown · Aug 7, 2023 · 2b7d04d · 2b7d04d
1 parent dfcf897
commit 2b7d04d
Show file tree

Hide file tree

Showing 16 changed files with 52 additions and 96 deletions.
diff --git a/...es/FMODStudioWrapperGMS2ExampleProject/FMODStudioWrapperGMS2ExampleProject.resource_order b/...es/FMODStudioWrapperGMS2ExampleProject/FMODStudioWrapperGMS2ExampleProject.resource_order
@@ -1,5 +1,6 @@
 {
   "FolderOrderSettings": [
+    {"name":"FMODGMS","order":4,"path":"folders/FMODGMS.yy",},
     {"name":"Objects","order":2,"path":"folders/Objects.yy",},
     {"name":"Collision","order":1,"path":"folders/Objects/Unown Collisions/Collision.yy",},
     {"name":"Parents","order":2,"path":"folders/Objects/Unown Collisions/Parents.yy",},
@@ -8,7 +9,6 @@
     {"name":"Unown Collisions","order":1,"path":"folders/Scripts/Unown Collisions.yy",},
     {"name":"Important Scripts","order":1,"path":"folders/Scripts/Unown Collisions/Important Scripts.yy",},
     {"name":"Misc Scripts","order":2,"path":"folders/Scripts/Unown Collisions/Misc Scripts.yy",},
-    {"name":"FMODGMS","order":4,"path":"folders/FMODGMS.yy",},
   ],
   "ResourceOrderSettings": [
     {"name":"bg_pipes","order":8,"path":"sprites/bg_pipes/bg_pipes.yy",},
@@ -22,16 +22,17 @@
     {"name":"obj_fmod","order":9,"path":"objects/obj_fmod/obj_fmod.yy",},
     {"name":"spr_robo_walk","order":2,"path":"sprites/spr_robo_walk/spr_robo_walk.yy",},
     {"name":"spr_robo_bombdispense","order":5,"path":"sprites/spr_robo_bombdispense/spr_robo_bombdispense.yy",},
-    {"name":"fmodGMS2","order":1,"path":"extensions/fmodGMS2/fmodGMS2.yy",},
     {"name":"obj_startupfade","order":7,"path":"objects/obj_startupfade/obj_startupfade.yy",},
     {"name":"obj_debris","order":5,"path":"objects/obj_debris/obj_debris.yy",},
     {"name":"spr_explosion","order":9,"path":"sprites/spr_explosion/spr_explosion.yy",},
     {"name":"spr_unownSolid","order":7,"path":"sprites/spr_unownSolid/spr_unownSolid.yy",},
     {"name":"spr_unownPixel","order":2,"path":"sprites/spr_unownPixel/spr_unownPixel.yy",},
     {"name":"obj_solid","order":6,"path":"objects/obj_solid/obj_solid.yy",},
     {"name":"event_play_at","order":2,"path":"scripts/event_play_at/event_play_at.yy",},
+    {"name":"License","order":2,"path":"notes/License/License.yy",},
     {"name":"spr_robo_crouchend","order":13,"path":"sprites/spr_robo_crouchend/spr_robo_crouchend.yy",},
     {"name":"spr_debris","order":12,"path":"sprites/spr_debris/spr_debris.yy",},
+    {"name":"fmodGMS2","order":1,"path":"extensions/fmodGMS2/fmodGMS2.yy",},
     {"name":"spr_credits","order":15,"path":"sprites/spr_credits/spr_credits.yy",},
     {"name":"spr_unownPlatform","order":3,"path":"sprites/spr_unownPlatform/spr_unownPlatform.yy",},
     {"name":"obj_movingPlatformTrigger","order":1,"path":"objects/obj_movingPlatformTrigger/obj_movingPlatformTrigger.yy",},

diff --git a/Examples/FMODStudioWrapperGMS2ExampleProject/FMODStudioWrapperGMS2ExampleProject.yyp b/Examples/FMODStudioWrapperGMS2ExampleProject/FMODStudioWrapperGMS2ExampleProject.yyp
diff --git a/Examples/FMODStudioWrapperGMS2ExampleProject/datafiles/Licenses.txt b/Examples/FMODStudioWrapperGMS2ExampleProject/datafiles/Licenses.txt
diff --git a/Examples/FMODStudioWrapperGMS2ExampleProject/extensions/fmodGMS2/FMODWrapperGMS.dll b/Examples/FMODStudioWrapperGMS2ExampleProject/extensions/fmodGMS2/FMODWrapperGMS.dll
diff --git a/Examples/FMODStudioWrapperGMS2ExampleProject/extensions/fmodGMS2/fmodGMS2.yy b/Examples/FMODStudioWrapperGMS2ExampleProject/extensions/fmodGMS2/fmodGMS2.yy
diff --git a/...iles/README (Important License Stuff).txt → ...2ExampleProject/notes/License/License.txt b/...iles/README (Important License Stuff).txt → ...2ExampleProject/notes/License/License.txt
@@ -1,6 +1,3 @@
-// FMOD License. 
-https://www.fmod.com/licensing
-
 BSD 2-Clause License
 
 Copyright (c) 2023, Mr. Unown
@@ -24,4 +21,7 @@ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# FMOD's License
+https://www.fmod.com/licensing
diff --git a/Examples/FMODStudioWrapperGMS2ExampleProject/notes/License/License.yy b/Examples/FMODStudioWrapperGMS2ExampleProject/notes/License/License.yy
diff --git a/Examples/FMODStudioWrapperGMS2ExampleProject/scripts/scr_fmodUtility/scr_fmodUtility.gml b/Examples/FMODStudioWrapperGMS2ExampleProject/scripts/scr_fmodUtility/scr_fmodUtility.gml
@@ -7,8 +7,9 @@ function event_play_oneshot(event_path) {
 	fmod_event_release(event_id);
 	return event_id;
 }
+
 /// @desc Check if any instance of the event is playing.
-/// @param {string} event_path Relative path to the FMOD Event.
-function event_isplaying(event_path) {
-	return (fmod_event_getPlaybackState(event_path) == FMOD_STUDIO_PLAYBACK_PLAYING);
-}
+/// @param {real} event_handle Handle to the FMOD Event Instance Object.
+function event_isplaying(event_handle) {
+	return (fmod_event_getPlaybackState(event_handle) == FMOD_STUDIO_PLAYBACK_PLAYING);
+}
diff --git a/gms2proj/extensions/fmodGMS2/FMODWrapperGMS.dll b/gms2proj/extensions/fmodGMS2/FMODWrapperGMS.dll
diff --git a/gms2proj/extensions/fmodGMS2/fmodGMS2.yy b/gms2proj/extensions/fmodGMS2/fmodGMS2.yy
diff --git a/gms2proj/gms2proj.resource_order b/gms2proj/gms2proj.resource_order
@@ -1,4 +1,6 @@
 {
   "FolderOrderSettings": [],
-  "ResourceOrderSettings": [],
+  "ResourceOrderSettings": [
+    {"name":"License","order":1,"path":"notes/License/License.yy",},
+  ],
 }
diff --git a/gms2proj/gms2proj.yyp b/gms2proj/gms2proj.yyp
diff --git a/gms2proj/metadata.json b/gms2proj/metadata.json
diff --git a/...iles/README (Important License Stuff).txt → gms2proj/notes/License/License.txt b/...iles/README (Important License Stuff).txt → gms2proj/notes/License/License.txt
@@ -1,6 +1,3 @@
-// FMOD License. 
-https://www.fmod.com/licensing
-
 BSD 2-Clause License
 
 Copyright (c) 2023, Mr. Unown
@@ -24,4 +21,7 @@ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# FMOD's License
+https://www.fmod.com/licensing
diff --git a/gms2proj/notes/License/License.yy b/gms2proj/notes/License/License.yy
diff --git a/gms2proj/scripts/scr_fmodUtility/scr_fmodUtility.gml b/gms2proj/scripts/scr_fmodUtility/scr_fmodUtility.gml
@@ -7,8 +7,9 @@ function event_play_oneshot(event_path) {
 	fmod_event_release(event_id);
 	return event_id;
 }
+
 /// @desc Check if any instance of the event is playing.
-/// @param {string} event_path Relative path to the FMOD Event.
-function event_isplaying(event_path) {
-	return (fmod_event_getPlaybackState(event_path) == FMOD_STUDIO_PLAYBACK_PLAYING);
-}
+/// @param {real} event_handle Handle to the FMOD Event Instance Object.
+function event_isplaying(event_handle) {
+	return (fmod_event_getPlaybackState(event_handle) == FMOD_STUDIO_PLAYBACK_PLAYING);
+}