Skip to content
This repository was archived by the owner on Jul 24, 2020. It is now read-only.

Commit e33173c

Browse files
committed
Avoid RGSSReset in error hook
1 parent 7f29c3f commit e33173c

File tree

3 files changed

+8
-0
lines changed

3 files changed

+8
-0
lines changed

RME.rb

+4
Original file line numberDiff line numberDiff line change
@@ -7827,6 +7827,8 @@ def eval(str, r=nil)
78277827
script = str.gsub(/S(V|S)\[(\d+)\]/) { "S#{$1}[#{@id}, #{$2}]" }
78287828
begin
78297829
extender_eval(script, $game_map.interpreter.get_binding)
7830+
rescue RGSSReset
7831+
raise
78307832
rescue Exception => e
78317833
Feedback.hook(
78327834
"Error in move route",
@@ -10755,6 +10757,8 @@ def eval(script, r=nil)
1075510757
message = @error_message || "Error in script call"
1075610758
begin
1075710759
extender_eval(script, r)
10760+
rescue RGSSReset
10761+
raise
1075810762
rescue Exception => e
1075910763
Feedback.hook(
1076010764
message,

project/Data/CommonEvents.rvdata2

135 Bytes
Binary file not shown.

src/EvEx.rb

+4
Original file line numberDiff line numberDiff line change
@@ -1686,6 +1686,8 @@ def eval(str, r=nil)
16861686
script = str.gsub(/S(V|S)\[(\d+)\]/) { "S#{$1}[#{@id}, #{$2}]" }
16871687
begin
16881688
extender_eval(script, $game_map.interpreter.get_binding)
1689+
rescue RGSSReset
1690+
raise
16891691
rescue Exception => e
16901692
Feedback.hook(
16911693
"Error in move route",
@@ -4614,6 +4616,8 @@ def eval(script, r=nil)
46144616
message = @error_message || "Error in script call"
46154617
begin
46164618
extender_eval(script, r)
4619+
rescue RGSSReset
4620+
raise
46174621
rescue Exception => e
46184622
Feedback.hook(
46194623
message,

0 commit comments

Comments
 (0)