Me fucking game crash fix

JorJoe05 · Dec 4, 2023 · 6034125 · 6034125
1 parent d08f2cb
commit 6034125
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 4 deletions.
diff --git a/Super Freaks 1 Ultimate Edition.resource_order b/Super Freaks 1 Ultimate Edition.resource_order
@@ -1675,7 +1675,6 @@
     {"name":"input_y","order":5,"path":"scripts/input_y/input_y.yy",},
     {"name":"__input_class_gamepad_motion","order":8,"path":"scripts/__input_class_gamepad_motion/__input_class_gamepad_motion.yy",},
     {"name":"rm_star_4","order":22,"path":"rooms/rm_star_4/rm_star_4.yy",},
-    {"name":"scr_approach","order":6,"path":"scripts/scr_approach/scr_approach.yy",},
     {"name":"sfx_collect","order":8,"path":"sounds/sfx_collect/sfx_collect.yy",},
     {"name":"msc_park","order":8,"path":"sounds/msc_park/msc_park.yy",},
     {"name":"rm_cutscene_intro_kranion","order":13,"path":"rooms/rm_cutscene_intro_kranion/rm_cutscene_intro_kranion.yy",},

diff --git a/Super Freaks 1 Ultimate Edition.yyp b/Super Freaks 1 Ultimate Edition.yyp
diff --git a/options/ios/options_ios.yy b/options/ios/options_ios.yy
diff --git a/options/mac/options_mac.yy b/options/mac/options_mac.yy
diff --git a/scripts/scr_math_general/scr_math_general.gml b/scripts/scr_math_general/scr_math_general.gml
@@ -7,4 +7,16 @@ function lerp_360(_angle_1, _angle_2, _amount = 0)
 	return _angle_1 - (angle_difference(_angle_1, _angle_2) * _amount);
 
 	gml_pragma("forceinline");
+}
+
+/// @function approach
+/// @param _start
+/// @param _target
+/// @param _shift
+function approach(_start, _target, _shift) 
+{
+    if (_start < _target)
+        return min(_start + _shift, _target);
+    else
+        return max(_start - _shift, _target);
 }