DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-07 13:15:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5 from jonisavo/handlerhash-block

Browse Source 
Allow HandlerHash#add to take a block
This commit is contained in:
Maruno17
2020-09-06 12:32:34 +01:00
committed by GitHub
parent 6c4670eaa3 cca8264bf5
commit 2bd3a6dd99
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Data/Scripts/006_Game processing/003_Event_Handlers.rb
View File

@@ -95,15 +95,21 @@ class HandlerHash
return ret
end
def addIf(condProc,handler)
@addIfs.push([condProc,handler])
def addIf(conditionProc,handler=nil,&handlerBlock)
if ![Proc,Hash].include?(handler.class) && !block_given?
raise ArgumentError, "addIf call for #{self.class.name} has no valid handler (#{handler.inspect} was given)"
end
@addIfs.push([conditionProc,handler || handlerBlock])
end
def add(sym,handler) # 'sym' can be an ID or symbol
def add(sym,handler=nil,&handlerBlock) # 'sym' can be an ID or symbol
if ![Proc,Hash].include?(handler.class) && !block_given?
raise ArgumentError, "#{self.class.name} for #{sym.inspect} has no valid handler (#{handler.inspect} was given)"
end
id = fromSymbol(sym)
@hash[id] = handler if id
@hash[id] = handler || handlerBlock if id
symbol = toSymbol(sym)
@hash[symbol] = handler if symbol
@hash[symbol] = handler || handlerBlock if symbol
end
def copy(src,*dests)