Merge branch 'dev-lts'

JujuAdams · Mar 9, 2023 · c7baa74 · c7baa74
2 parents c5c360e + 59ae325
commit c7baa74
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <p align="center"><img src="https://raw.githubusercontent.com/JujuAdams/scribble/master/LOGO.png" style="display:block; margin:auto; width:300px"></p>
-<h1 align="center">Scribble 8.6.1</h1>
+<h1 align="center">Scribble 8.6.2</h1>
 
 <p align="center">A modern text renderer for GameMaker Studio 2022 LTS by <b>@jujuadams</b></p>
 

diff --git a/options/windows/options_windows.yy b/options/windows/options_windows.yy
diff --git a/scripts/__scribble_class_page/__scribble_class_page.gml b/scripts/__scribble_class_page/__scribble_class_page.gml
@@ -127,7 +127,7 @@ function __scribble_class_page() constructor
     {
         if (!SCRIBBLE_ALLOW_GLYPH_DATA_GETTER) __scribble_error("Cannot get glyph data, SCRIBBLE_ALLOW_GLYPH_DATA_GETTER = <false>\nPlease set SCRIBBLE_ALLOW_GLYPH_DATA_GETTER to <true> to get glyph data");
 
-        if (_index < 1)
+        if (_index < 0)
         {
             return {
                 unicode: 0,
@@ -137,8 +137,10 @@ function __scribble_class_page() constructor
                 bottom:  __glyph_grid[# 0, __SCRIBBLE_GLYPH_LAYOUT.__TOP ],
             };
         }
-        else if (_index <= __glyph_count)
+        else
         {
+            _index = min(_index, __glyph_count-1);
+
             return {
                 unicode: __glyph_grid[# _index, __SCRIBBLE_GLYPH_LAYOUT.__UNICODE],
                 left:    __glyph_grid[# _index, __SCRIBBLE_GLYPH_LAYOUT.__LEFT   ],
@@ -147,17 +149,6 @@ function __scribble_class_page() constructor
                 bottom:  __glyph_grid[# _index, __SCRIBBLE_GLYPH_LAYOUT.__BOTTOM ],
             };
         }
-        else
-        {
-            _index = __glyph_count-1;
-            return {
-                unicode: 0,
-                left:    __glyph_grid[# _index, __SCRIBBLE_GLYPH_LAYOUT.__RIGHT ],
-                top:     __glyph_grid[# _index, __SCRIBBLE_GLYPH_LAYOUT.__BOTTOM],
-                right:   __glyph_grid[# _index, __SCRIBBLE_GLYPH_LAYOUT.__RIGHT ],
-                bottom:  __glyph_grid[# _index, __SCRIBBLE_GLYPH_LAYOUT.__BOTTOM],
-            };
-        }
     }
 
     static __get_vertex_buffer = function(_texture, _pxrange, _thickness_offset, _bilinear, _model_struct)

diff --git a/scripts/__scribble_system/__scribble_system.gml b/scripts/__scribble_system/__scribble_system.gml
@@ -1,6 +1,6 @@
 // @jujuadams
-#macro __SCRIBBLE_VERSION           "8.6.1"
-#macro __SCRIBBLE_DATE              "2023-02-22"
+#macro __SCRIBBLE_VERSION           "8.6.2"
+#macro __SCRIBBLE_DATE              "2023-03-09"
 #macro __SCRIBBLE_DEBUG             false
 #macro __SCRIBBLE_VERBOSE_GC        false
 #macro SCRIBBLE_LOAD_FONTS_ON_BOOT  true