mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
Rewrote perma-caching code, added another controls help page
This commit is contained in:
@@ -86,30 +86,31 @@ module RPG
|
||||
self.load_bitmap("Graphics/Transitions/", filename)
|
||||
end
|
||||
|
||||
def self.addRef(folder_name, filename = "", hue = 0)
|
||||
def self.retain(folder_name, filename = "", hue = 0)
|
||||
path = folder_name + filename
|
||||
ret = fromCache(path)
|
||||
if hue > 0
|
||||
key = [path, hue]
|
||||
ret2 = fromCache(key)
|
||||
if ret2
|
||||
ret2.addRef
|
||||
ret2.never_dispose = true
|
||||
return
|
||||
end
|
||||
end
|
||||
ret.addRef if ret
|
||||
ret.never_dispose = true if ret
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
class BitmapWrapper < Bitmap
|
||||
attr_reader :refcount
|
||||
attr_reader :refcount
|
||||
attr_accessor :never_dispose
|
||||
|
||||
def dispose
|
||||
return if self.disposed?
|
||||
@refcount -= 1
|
||||
super if @refcount <= 0
|
||||
super if @refcount <= 0 && !never_dispose
|
||||
end
|
||||
|
||||
def initialize(*arg)
|
||||
|
||||
@@ -837,7 +837,7 @@ class SpriteWindow_Base < SpriteWindow
|
||||
@curframe=MessageConfig.pbGetSystemFrame()
|
||||
@curfont=MessageConfig.pbGetSystemFontName()
|
||||
@sysframe=AnimatedBitmap.new(@curframe)
|
||||
RPG::Cache.addRef(@curframe) if @curframe && !@curframe.empty?
|
||||
RPG::Cache.retain(@curframe) if @curframe && !@curframe.empty?
|
||||
@customskin=nil
|
||||
__setWindowskin(@sysframe.bitmap)
|
||||
__resolveSystemFrame()
|
||||
@@ -870,7 +870,7 @@ class SpriteWindow_Base < SpriteWindow
|
||||
resolvedName=pbResolveBitmap(skin)
|
||||
return if !resolvedName || resolvedName==""
|
||||
@customskin=AnimatedBitmap.new(resolvedName)
|
||||
RPG::Cache.addRef(resolvedName)
|
||||
RPG::Cache.retain(resolvedName)
|
||||
__setWindowskin(@customskin.bitmap)
|
||||
if self.skinformat==1
|
||||
skinbase=resolvedName.sub(/\.[^\.\/\\]+$/,"")
|
||||
@@ -905,7 +905,7 @@ class SpriteWindow_Base < SpriteWindow
|
||||
if @sysframe && !@customskin
|
||||
@sysframe.dispose if @sysframe
|
||||
@sysframe=AnimatedBitmap.new(@curframe)
|
||||
RPG::Cache.addRef(@curframe) if @curframe && !@curframe.empty?
|
||||
RPG::Cache.retain(@curframe) if @curframe && !@curframe.empty?
|
||||
@resolvedFrame=nil
|
||||
__setWindowskin(@sysframe.bitmap)
|
||||
__resolveSystemFrame()
|
||||
|
||||
@@ -964,8 +964,8 @@ module UpDownArrowMixin
|
||||
def initUpDownArrow
|
||||
@uparrow = AnimatedSprite.create("Graphics/Pictures/uparrow",8,2,self.viewport)
|
||||
@downarrow = AnimatedSprite.create("Graphics/Pictures/downarrow",8,2,self.viewport)
|
||||
RPG::Cache.addRef("Graphics/Pictures/uparrow")
|
||||
RPG::Cache.addRef("Graphics/Pictures/downarrow")
|
||||
RPG::Cache.retain("Graphics/Pictures/uparrow")
|
||||
RPG::Cache.retain("Graphics/Pictures/downarrow")
|
||||
@uparrow.z = 99998
|
||||
@downarrow.z = 99998
|
||||
@uparrow.visible = false
|
||||
@@ -1048,10 +1048,10 @@ class Window_DrawableCommand < SpriteWindow_SelectableEx
|
||||
self.viewport = viewport if viewport
|
||||
if isDarkWindowskin(self.windowskin)
|
||||
@selarrow = AnimatedBitmap.new("Graphics/Pictures/selarrow_white")
|
||||
RPG::Cache.addRef("Graphics/Pictures/selarrow_white")
|
||||
RPG::Cache.retain("Graphics/Pictures/selarrow_white")
|
||||
else
|
||||
@selarrow = AnimatedBitmap.new("Graphics/Pictures/selarrow")
|
||||
RPG::Cache.addRef("Graphics/Pictures/selarrow")
|
||||
RPG::Cache.retain("Graphics/Pictures/selarrow")
|
||||
end
|
||||
@index = 0
|
||||
colors = getDefaultTextColors(self.windowskin)
|
||||
|
||||
Reference in New Issue
Block a user