lib/cyberarm_engine/common.rb in cyberarm_engine-0.14.0 vs lib/cyberarm_engine/common.rb in cyberarm_engine-0.15.0

- old
+ new

@@ -1,8 +1,8 @@ module CyberarmEngine module Common - def push_state(klass, options={}) + def push_state(klass, options = {}) window.push_state(klass, options) end def current_state window.current_state @@ -18,11 +18,11 @@ def show_cursor window.show_cursor end - def show_cursor=boolean + def show_cursor=(boolean) window.show_cursor = boolean end def draw_rect(x, y, width, height, color, z = 0) Gosu.draw_rect(x, y, width, height, color, z) @@ -32,28 +32,28 @@ draw_rect(0, 0, window.width, window.height, color, z) end def lighten(color, amount = 25) if defined?(color.alpha) - return Gosu::Color.rgba(color.red + amount, color.green + amount, color.blue + amount, color.alpha) + Gosu::Color.rgba(color.red + amount, color.green + amount, color.blue + amount, color.alpha) else - return Gosu::Color.rgb(color.red + amount, color.green + amount, color.blue + amount) + Gosu::Color.rgb(color.red + amount, color.green + amount, color.blue + amount) end end def darken(color, amount = 25) if defined?(color.alpha) - return Gosu::Color.rgba(color.red - amount, color.green - amount, color.blue - amount, color.alpha) + Gosu::Color.rgba(color.red - amount, color.green - amount, color.blue - amount, color.alpha) else - return Gosu::Color.rgb(color.red - amount, color.green - amount, color.blue - amount) + Gosu::Color.rgb(color.red - amount, color.green - amount, color.blue - amount) end end def opacity(color, ratio = 1.0) alpha = 255 * ratio - return Gosu::Color.rgba(color.red, color.green, color.blue, alpha) + Gosu::Color.rgba(color.red, color.green, color.blue, alpha) end def get_asset(path, hash, klass, retro = false, tileable = false) asset = nil hash.detect do |_asset, instance| @@ -63,19 +63,19 @@ end end unless asset instance = nil - if klass == Gosu::Image - instance = klass.new(path, retro: retro, tileable: tileable) - else - instance = klass.new(path) - end + instance = if klass == Gosu::Image + klass.new(path, retro: retro, tileable: tileable) + else + klass.new(path) + end hash[path] = instance asset = instance end - return asset + asset end def get_image(path, retro: false, tileable: false) get_asset(path, Window::IMAGES, Gosu::Image, retro, tileable) end