Fixed a small bug with strings in arrays

tabularelf · Sep 8, 2023 · 27f8f78 · 27f8f78
1 parent b5f9e3c
commit 27f8f78
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/scripts/__lexicon_definitions_parse_files/__lexicon_definitions_parse_files.gml b/scripts/__lexicon_definitions_parse_files/__lexicon_definitions_parse_files.gml
@@ -13,8 +13,14 @@ function __lexicon_definitions_parse_files(_definitionsFilePath, _fileStruct) {
 	if (is_array(_fileStruct)) {
 		var _i = 0;
 		repeat(array_length(_fileStruct)) {
-			if (string_char_at(_fileStruct[_i][$ "filePath"], 1) == ".") {
-				_fileStruct[_i][$ "filePath"] = _filePath + string_copy(_fileStruct[_i][$ "filePath"], 3, string_length(_fileStruct[_i][$ "filePath"]));
+			if (is_string(_fileStruct[_i])) {
+				if (string_char_at(_fileStruct[_i], 1) == ".") {
+					_fileStruct[_i] = _filePath + string_copy(_fileStruct[_i], 3, string_length(_fileStruct[_i]));	
+				}
+			} else {
+				if (string_char_at(_fileStruct[_i][$ "filePath"], 1) == ".") {
+					_fileStruct[_i][$ "filePath"] = _filePath + string_copy(_fileStruct[_i][$ "filePath"], 3, string_length(_fileStruct[_i][$ "filePath"]));
+				}
 			}
 			++_i;
 		}

diff --git a/scripts/lexicon_index_definitions/lexicon_index_definitions.gml b/scripts/lexicon_index_definitions/lexicon_index_definitions.gml
@@ -70,6 +70,7 @@ function lexicon_index_definitions(_filePath) {
 			}
 		}
 
+		_j = 0;
 		if (is_array(_files)) {
 			var _fileLen = array_length(_files);
 			repeat(_fileLen) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -70,6 +70,7 @@ function lexicon_index_definitions(_filePath) { @@
     			}
     		}
+    		_j = 0;
     		if (is_array(_files)) {
     			var _fileLen = array_length(_files);
     			repeat(_fileLen) {
@@ Expand Down @@