MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop-cf-autofix' into develop

develop
lethosor 2018-07-02 13:44:20 -04:00
parent f0ff96f614 a08f08ae5f
commit 7e91173289
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/ruby/ruby-autogen-defs.rb
Unescape Escape View File

@ -487,7 +487,7 @@ module DFHack
def length def length
if @_length == -1 if @_length == -1
maxlen = 4096 - (@_memaddr & 0xfff) maxlen = 4096 - (@_memaddr & 0xfff)
maxlen += 4096 until len = DFHack.memory_read(@_memaddr, maxlen).index(?\0) maxlen += 4096 until len = DFHack.memory_read(@_memaddr, maxlen).index("\0")
len len
else else
@_length @_length

4
plugins/ruby/ruby.rb
Unescape Escape View File

@ -80,7 +80,7 @@ module DFHack
@onupdate_list ||= [] @onupdate_list ||= []
@onupdate_list << OnupdateCallback.new(descr, b, ticklimit, initialtickdelay) @onupdate_list << OnupdateCallback.new(descr, b, ticklimit, initialtickdelay)
DFHack.onupdate_active = true DFHack.onupdate_active = true
if onext = @onupdate_list.sort.first if onext = @onupdate_list.min
DFHack.onupdate_minyear = onext.minyear DFHack.onupdate_minyear = onext.minyear
DFHack.onupdate_minyeartick = onext.minyeartick DFHack.onupdate_minyeartick = onext.minyeartick
end end
@ -123,7 +123,7 @@ module DFHack
o.check_run(y, yt, ytmax) o.check_run(y, yt, ytmax)
} }
if onext = @onupdate_list.sort.first if onext = @onupdate_list.min
DFHack.onupdate_minyear = onext.minyear DFHack.onupdate_minyear = onext.minyear
if ytmax > TICKS_PER_YEAR if ytmax > TICKS_PER_YEAR
DFHack.onupdate_minyeartick = -1 DFHack.onupdate_minyeartick = -1