More Rubocop changes

This commit is contained in:
Maruno17
2022-02-13 00:57:54 +00:00
parent cca5989746
commit f68e699cc9
108 changed files with 708 additions and 808 deletions

View File

@@ -503,7 +503,7 @@ end
# Disposes all objects in the specified hash.
def pbDisposeSpriteHash(sprites)
return if !sprites
sprites.keys.each do |i|
sprites.each_key do |i|
pbDisposeSprite(sprites, i)
end
sprites.clear
@@ -665,7 +665,7 @@ end
# _activeStatuses_ is the result of a previous call to pbActivateWindows
def pbRestoreActivations(sprites, activeStatuses)
return if !sprites || !activeStatuses
activeStatuses.keys.each do |k|
activeStatuses.each_key do |k|
if sprites[k].is_a?(Window) && !pbDisposed?(sprites[k])
sprites[k].active = activeStatuses[k] ? true : false
end
@@ -723,7 +723,7 @@ def addBackgroundPlane(sprites, planename, background, viewport = nil)
sprites[planename].visible = false
else
sprites[planename].setBitmap(bitmapName)
sprites.values.each do |spr|
sprites.each_value do |spr|
if spr.is_a?(Window)
spr.windowskin = nil
end
@@ -745,7 +745,7 @@ def addBackgroundOrColoredPlane(sprites, planename, background, color, viewport
else
sprites[planename] = AnimatedPlane.new(viewport)
sprites[planename].setBitmap(bitmapName)
sprites.values.each do |spr|
sprites.each_value do |spr|
if spr.is_a?(Window)
spr.windowskin = nil
end

View File

@@ -317,7 +317,7 @@ class SpriteWindow < Window
end
privRefresh if mustchange
if @flash > 0
@sprites.values.each do |i|
@sprites.each_value do |i|
i.update
end
@flash -= 1

View File

@@ -93,7 +93,7 @@ class PictureWindow < SpriteWindow_Base
# is ignored unless pathOrBitmap is a filename)
def setBitmap(pathOrBitmap, hue = 0)
clearBitmaps
if pathOrBitmap != nil && pathOrBitmap != ""
if pathOrBitmap && pathOrBitmap != ""
case pathOrBitmap
when Bitmap
@_iconbitmap = pathOrBitmap

View File

@@ -6,10 +6,10 @@ class AnimatedBitmap
raise "Filename is nil (missing graphic)." if file.nil?
path = file
filename = ""
if file.last != '/' # Isn't just a directory
if file.last != "/" # Isn't just a directory
split_file = file.split(/[\\\/]/)
filename = split_file.pop
path = split_file.join('/') + '/'
path = split_file.join("/") + "/"
end
if filename[/^\[\d+(?:,\d+)?\]/] # Starts with 1 or 2 numbers in square brackets
@bitmap = PngAnimatedBitmap.new(path, filename, hue)

View File

@@ -30,16 +30,14 @@ def pbEventCommentInput(*args)
return nil if list.nil?
return nil unless list.is_a?(Array)
list.each do |item|
next unless item.code == 108 || item.code == 408
if item.parameters[0] == trigger
start = list.index(item) + 1
finish = start + elements
(start...finish).each do |id|
next if !list[id]
parameters.push(list[id].parameters[0])
end
return parameters
next if ![108, 108].include?(item.code)
next if item.parameters[0] != trigger
start = list.index(item) + 1
finish = start + elements
(start...finish).each do |id|
parameters.push(list[id].parameters[0]) if list[id]
end
return parameters
end
return nil
end
@@ -557,7 +555,7 @@ def pbMessageDisplay(msgwindow, message, letterbyletter = true, commandProc = ni
end
end
end
if startSE != nil
if startSE
pbSEPlay(pbStringToAudioFile(startSE))
elsif signWaitCount == 0 && letterbyletter
pbPlayDecisionSE