Skip to content

Commit

Permalink
Removes gc_collect() code as GM bug is now resolved
Browse files Browse the repository at this point in the history
  • Loading branch information
JujuAdams committed Apr 16, 2021
1 parent b77d669 commit 0128ada
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 17 deletions.
4 changes: 2 additions & 2 deletions rooms/rm_test/rm_test.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions scripts/__scribble_config_macros/__scribble_config_macros.gml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
#macro SCRIBBLE_COMMAND_TAG_CLOSE ord("]") //Character used to close a command tag. First 127 ASCII chars only
#macro SCRIBBLE_COMMAND_TAG_ARGUMENT ord(",") //Character used to delimit a command parameter inside a command tag. First 127 ASCII chars only

#macro SCRIBBLE_CACHE_COLLECT_FREQ 10000 //How often to force gc_collect(). This is essential as it works around a bug in GMS2.3.1. If you'd like to run gc_collect() yourself, set this macro to less than zero

#macro SCRIBBLE_CREATE_GLYPH_LTRB_ARRAY false //*DEPRECATED* Outputs an array of glyph LTRB bounding boxes
#macro SCRIBBLE_CREATE_CHARACTER_ARRAY false //*DEPRECATED* Outputs an array of character codes

Expand Down
13 changes: 0 additions & 13 deletions scripts/__scribble_gc_collect/__scribble_gc_collect.gml
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
function __scribble_gc_collect()
{
#region Call gc_collect() manually every few seconds (works around a bug in GMS2.3.1)

if ((SCRIBBLE_CACHE_COLLECT_FREQ >= 0) && (global.__scribble_gc_collect_time + SCRIBBLE_CACHE_COLLECT_FREQ < current_time))
{
global.__scribble_gc_collect_time = current_time;
if (__SCRIBBLE_DEBUG) __scribble_trace("Running gc_collect()");
gc_collect();
}

#endregion



if (current_time - global.__scribble_cache_check_time < __SCRIBBLE_EXPECTED_FRAME_TIME) exit;
global.__scribble_cache_check_time = current_time;

Expand Down

0 comments on commit 0128ada

Please sign in to comment.