Merge branch 'dev'

JujuAdams · Nov 2, 2022 · 7c53607 · 7c53607
2 parents 49cbe4e + bffefce
commit 7c53607
Show file tree

Hide file tree

Showing 26 changed files with 107 additions and 113 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <p align="center"><img src="https://raw.githubusercontent.com/JujuAdams/Chatterbox/master/LOGO.png" style="display:block; margin:auto; width:400px"></p>
-<h1 align="center">2.8.1</h1>
+<h1 align="center">2.8.2</h1>
 
 <p align="center">Narrative engine for GameMaker by <b>@jujuadams</b></p>
 

diff --git a/chatterbox.yyp b/chatterbox.yyp
diff --git a/options/windows/options_windows.yy b/options/windows/options_windows.yy
diff --git a/scripts/ChatterboxCreate/ChatterboxCreate.yy b/scripts/ChatterboxCreate/ChatterboxCreate.yy
diff --git a/scripts/ChatterboxGetAllContentString/ChatterboxGetAllContentString.yy b/scripts/ChatterboxGetAllContentString/ChatterboxGetAllContentString.yy
diff --git a/scripts/ChatterboxGetContent/ChatterboxGetContent.yy b/scripts/ChatterboxGetContent/ChatterboxGetContent.yy
diff --git a/scripts/ChatterboxGetContentArray/ChatterboxGetContentArray.yy b/scripts/ChatterboxGetContentArray/ChatterboxGetContentArray.yy
diff --git a/scripts/ChatterboxGetContentCount/ChatterboxGetContentCount.yy b/scripts/ChatterboxGetContentCount/ChatterboxGetContentCount.yy
diff --git a/scripts/ChatterboxGetContentMetadata/ChatterboxGetContentMetadata.yy b/scripts/ChatterboxGetContentMetadata/ChatterboxGetContentMetadata.yy
diff --git a/scripts/ChatterboxGetContentSpeaker/ChatterboxGetContentSpeaker.yy b/scripts/ChatterboxGetContentSpeaker/ChatterboxGetContentSpeaker.yy
diff --git a/scripts/ChatterboxGetContentSpeakerData/ChatterboxGetContentSpeakerData.yy b/scripts/ChatterboxGetContentSpeakerData/ChatterboxGetContentSpeakerData.yy
diff --git a/scripts/ChatterboxGetContentSpeech/ChatterboxGetContentSpeech.yy b/scripts/ChatterboxGetContentSpeech/ChatterboxGetContentSpeech.yy
diff --git a/scripts/ChatterboxGetCurrent/ChatterboxGetCurrent.yy b/scripts/ChatterboxGetCurrent/ChatterboxGetCurrent.yy
diff --git a/scripts/ChatterboxGetCurrentMetadata/ChatterboxGetCurrentMetadata.yy b/scripts/ChatterboxGetCurrentMetadata/ChatterboxGetCurrentMetadata.yy
diff --git a/scripts/ChatterboxGetCurrentSource/ChatterboxGetCurrentSource.yy b/scripts/ChatterboxGetCurrentSource/ChatterboxGetCurrentSource.yy
diff --git a/scripts/ChatterboxGetOption/ChatterboxGetOption.yy b/scripts/ChatterboxGetOption/ChatterboxGetOption.yy
diff --git a/scripts/ChatterboxGetOptionArray/ChatterboxGetOptionArray.yy b/scripts/ChatterboxGetOptionArray/ChatterboxGetOptionArray.yy
diff --git a/scripts/ChatterboxGetOptionConditionBool/ChatterboxGetOptionConditionBool.yy b/scripts/ChatterboxGetOptionConditionBool/ChatterboxGetOptionConditionBool.yy
diff --git a/scripts/ChatterboxGetOptionCount/ChatterboxGetOptionCount.yy b/scripts/ChatterboxGetOptionCount/ChatterboxGetOptionCount.yy
diff --git a/scripts/ChatterboxGetOptionMetadata/ChatterboxGetOptionMetadata.yy b/scripts/ChatterboxGetOptionMetadata/ChatterboxGetOptionMetadata.yy
diff --git a/scripts/ChatterboxGetVisited/ChatterboxGetVisited.yy b/scripts/ChatterboxGetVisited/ChatterboxGetVisited.yy
diff --git a/scripts/ChatterboxLoadFromFile/ChatterboxLoadFromFile.gml b/scripts/ChatterboxLoadFromFile/ChatterboxLoadFromFile.gml
@@ -6,7 +6,7 @@
 function ChatterboxLoadFromFile()
 {
     var _path      = argument[0];
-    var _aliasName = ((argument_count > 1) && (argument[1] != undefined))? argument[1] : filename_name(_path);
+    var _aliasName = ((argument_count > 1) && (argument[1] != undefined))? argument[1] : _path;
 
     if (!is_string(_path))
     {

diff --git a/scripts/ChatterboxSourceGetNodeTitles/ChatterboxSourceGetNodeTitles.yy b/scripts/ChatterboxSourceGetNodeTitles/ChatterboxSourceGetNodeTitles.yy
diff --git a/scripts/IsChatterbox/IsChatterbox.yy b/scripts/IsChatterbox/IsChatterbox.yy
diff --git a/scripts/__ChatterboxSystem/__ChatterboxSystem.gml b/scripts/__ChatterboxSystem/__ChatterboxSystem.gml
@@ -1,7 +1,7 @@
 #region Internal Macro Definitions
 
-#macro __CHATTERBOX_VERSION  "2.8.1"
-#macro __CHATTERBOX_DATE     "2022-10-15"
+#macro __CHATTERBOX_VERSION  "2.8.2"
+#macro __CHATTERBOX_DATE     "2022-11-02"
 
 #macro CHATTERBOX_VARIABLES_MAP   global.__chatterboxVariablesMap
 #macro CHATTERBOX_VARIABLES_LIST  global.__chatterboxVariablesList

diff --git a/scripts/__ChatterboxSystem/__ChatterboxSystem.yy b/scripts/__ChatterboxSystem/__ChatterboxSystem.yy