mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2026-01-22 22:36:03 +00:00
More Rubocop changes
This commit is contained in:
@@ -269,12 +269,11 @@ class AnimationWindow < SpriteWrapper
|
||||
swatchrects.push(Rect.new(arrowwidth + (i * 96) + self.x, self.y, 96, 96))
|
||||
end
|
||||
NUMFRAMES.times do |i|
|
||||
if swatchrects[i].contains(mousepos[0], mousepos[1])
|
||||
@selected = @start + i
|
||||
@changed = true
|
||||
refresh
|
||||
return
|
||||
end
|
||||
next if !swatchrects[i].contains(mousepos[0], mousepos[1])
|
||||
@selected = @start + i
|
||||
@changed = true
|
||||
refresh
|
||||
return
|
||||
end
|
||||
# Left arrow
|
||||
if left.contains(mousepos[0], mousepos[1])
|
||||
@@ -924,17 +923,16 @@ class AnimationCanvas < Sprite
|
||||
# self.bitmap=@testscreen.bitmap
|
||||
if @currentframe < @animation.length
|
||||
PBAnimation::MAX_SPRITES.times do |i|
|
||||
if @dirty[i]
|
||||
if @celsprites[i]
|
||||
setBitmap(i, @currentframe)
|
||||
pbSpriteSetAnimFrame(@celsprites[i], @animation[@currentframe][i], @celsprites[0], @celsprites[1], true)
|
||||
@celsprites[i].x += BORDERSIZE
|
||||
@celsprites[i].y += BORDERSIZE
|
||||
end
|
||||
setPreviousFrame(i)
|
||||
setFrame(i)
|
||||
@dirty[i] = false
|
||||
next if !@dirty[i]
|
||||
if @celsprites[i]
|
||||
setBitmap(i, @currentframe)
|
||||
pbSpriteSetAnimFrame(@celsprites[i], @animation[@currentframe][i], @celsprites[0], @celsprites[1], true)
|
||||
@celsprites[i].x += BORDERSIZE
|
||||
@celsprites[i].y += BORDERSIZE
|
||||
end
|
||||
setPreviousFrame(i)
|
||||
setFrame(i)
|
||||
@dirty[i] = false
|
||||
end
|
||||
else
|
||||
PBAnimation::MAX_SPRITES.times do |i|
|
||||
|
||||
@@ -644,13 +644,13 @@ def pbEditBG(canvas, timing)
|
||||
maxsizewindow.addOptionalSlider(_INTL("Alpha:"), 0, 255, timing.colorAlpha || 0)
|
||||
maxsizewindow.addButton(_INTL("OK"))
|
||||
maxsizewindow.addButton(_INTL("Cancel"))
|
||||
maxsizewindow.controls[1].checked = (timing.bgX != nil)
|
||||
maxsizewindow.controls[2].checked = (timing.bgY != nil)
|
||||
maxsizewindow.controls[3].checked = (timing.opacity != nil)
|
||||
maxsizewindow.controls[4].checked = (timing.colorRed != nil)
|
||||
maxsizewindow.controls[5].checked = (timing.colorGreen != nil)
|
||||
maxsizewindow.controls[6].checked = (timing.colorBlue != nil)
|
||||
maxsizewindow.controls[7].checked = (timing.colorAlpha != nil)
|
||||
maxsizewindow.controls[1].checked = !timing.bgX.nil?
|
||||
maxsizewindow.controls[2].checked = !timing.bgY.nil?
|
||||
maxsizewindow.controls[3].checked = !timing.opacity.nil?
|
||||
maxsizewindow.controls[4].checked = !timing.colorRed.nil?
|
||||
maxsizewindow.controls[5].checked = !timing.colorGreen.nil?
|
||||
maxsizewindow.controls[6].checked = !timing.colorBlue.nil?
|
||||
maxsizewindow.controls[7].checked = !timing.colorAlpha.nil?
|
||||
maxsizewindow.opacity = 200
|
||||
maxsizewindow.viewport = canvas.viewport
|
||||
loop do
|
||||
|
||||
Reference in New Issue
Block a user