mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
Fixed bad encoding of plugin scripts causing accented characters to display incorrectly, plugins are listed in the console when loaded, fixed error when resizing an animation will delete the frame you're currently on, fixed changes to animations persisting despite not saving them in the Animation Editor
This commit is contained in:
@@ -644,7 +644,6 @@ module PluginManager
|
||||
# Check if plugins need compiling
|
||||
#-----------------------------------------------------------------------------
|
||||
def self.compilePlugins(order, plugins)
|
||||
echoln ""
|
||||
echo 'Compiling plugin scripts...'
|
||||
scripts = []
|
||||
# go through the entire order one by one
|
||||
@@ -680,6 +679,7 @@ module PluginManager
|
||||
self.compilePlugins(order, plugins) if self.needCompiling?(order, plugins)
|
||||
# load plugins
|
||||
scripts = load_data("Data/PluginScripts.rxdata")
|
||||
echoed_plugins = []
|
||||
for plugin in scripts
|
||||
# get the required data
|
||||
name, meta, script = plugin
|
||||
@@ -688,7 +688,7 @@ module PluginManager
|
||||
# go through each script and interpret
|
||||
for scr in script
|
||||
# turn code into plaintext
|
||||
code = Zlib::Inflate.inflate(scr[1])
|
||||
code = Zlib::Inflate.inflate(scr[1]).force_encoding(Encoding::UTF_8)
|
||||
# get rid of tabs
|
||||
code.gsub!("\t", " ")
|
||||
# construct filename
|
||||
@@ -697,12 +697,15 @@ module PluginManager
|
||||
# try to run the code
|
||||
begin
|
||||
eval(code, TOPLEVEL_BINDING, fname)
|
||||
echoln "Loaded plugin: #{name}" if !echoed_plugins.include?(name)
|
||||
echoed_plugins.push(name)
|
||||
rescue Exception # format error message to display
|
||||
self.pluginErrorMsg(name, sname)
|
||||
Kernel.exit! true
|
||||
end
|
||||
end
|
||||
end
|
||||
echoln "" if !echoed_plugins.empty?
|
||||
end
|
||||
#-----------------------------------------------------------------------------
|
||||
end
|
||||
|
||||
@@ -1016,9 +1016,9 @@ def animationEditorMain(animation)
|
||||
if Input.trigger?(Input::BACK)
|
||||
if pbConfirmMessage(_INTL("Save changes?"))
|
||||
save_data(animation,"Data/PkmnAnimations.rxdata")
|
||||
$PokemonTemp.battleAnims = nil
|
||||
end
|
||||
if pbConfirmMessage(_INTL("Exit from the editor?"))
|
||||
$PokemonTemp.battleAnims = nil
|
||||
break
|
||||
end
|
||||
end
|
||||
@@ -1113,6 +1113,10 @@ def animationEditorMain(animation)
|
||||
end
|
||||
if sliderwin.changed?(1) # Change frame count
|
||||
pbChangeMaximum(canvas)
|
||||
if canvas.currentframe >= canvas.animation.length
|
||||
canvas.currentframe = canvas.animation.length - 1
|
||||
sliderwin.controls[0].curvalue = canvas.currentframe + 1
|
||||
end
|
||||
sliderwin.refresh
|
||||
end
|
||||
if sliderwin.changed?(2) # Set Animation Sheet
|
||||
|
||||
@@ -681,7 +681,6 @@ module Compiler
|
||||
MessageTypes.loadMessageFile("Data/messages.dat")
|
||||
end
|
||||
if mustCompile
|
||||
echoln ""
|
||||
echoln _INTL("*** Starting full compile ***")
|
||||
echoln ""
|
||||
yield(_INTL("Compiling town map data"))
|
||||
|
||||
Reference in New Issue
Block a user