mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
Fixed compiler always triggering
This commit is contained in:
20
Data/Scripts/001_Technical/001_MKXP_Compatibility.rb
Normal file
20
Data/Scripts/001_Technical/001_MKXP_Compatibility.rb
Normal file
@@ -0,0 +1,20 @@
|
||||
$MKXP = !!defined?(System)
|
||||
|
||||
def mkxp?
|
||||
return $MKXP
|
||||
end
|
||||
|
||||
CHARACTER_OFFSETS = {
|
||||
"p" => [0, 2],
|
||||
"g" => [0, 2],
|
||||
"y" => [0, 2],
|
||||
"q" => [0, 2]
|
||||
}
|
||||
|
||||
def pbSetWindowText(string)
|
||||
if mkxp?
|
||||
System.set_window_title(string || System.game_title)
|
||||
else
|
||||
Win32API.SetWindowText(string || "RGSS Player")
|
||||
end
|
||||
end
|
||||
@@ -1,19 +1,3 @@
|
||||
#===============================================================================
|
||||
# mkxp setup
|
||||
#===============================================================================
|
||||
$MKXP = !!defined?(System)
|
||||
|
||||
def mkxp?
|
||||
return $MKXP
|
||||
end
|
||||
|
||||
CHARACTER_OFFSETS = {
|
||||
"p" => [0, 2],
|
||||
"g" => [0, 2],
|
||||
"y" => [0, 2],
|
||||
"q" => [0, 2]
|
||||
}
|
||||
|
||||
#===============================================================================
|
||||
# class Class
|
||||
#===============================================================================
|
||||
@@ -197,7 +197,7 @@ def pbEachFileSectionEx(f)
|
||||
end
|
||||
lineno += 1
|
||||
Graphics.update if lineno%500==0
|
||||
Win32API.SetWindowText(_INTL("Processing line {1}",lineno)) if lineno%50==0
|
||||
pbSetWindowText(_INTL("Processing line {1}",lineno)) if lineno%50==0
|
||||
}
|
||||
yield lastsection,sectionname if havesection
|
||||
end
|
||||
@@ -1167,18 +1167,19 @@ def pbCompileAllData(mustCompile)
|
||||
yield(_INTL("Compiling shadow move data"))
|
||||
pbCompileShadowMoves
|
||||
yield(_INTL("Compiling messages"))
|
||||
pbCompileAnimations
|
||||
pbCompileTrainerEvents(mustCompile)
|
||||
pbSetTextMessages
|
||||
MessageTypes.saveMessages
|
||||
else
|
||||
if (!$INEDITOR || LANGUAGES.length<2) && safeExists?("Data/messages.dat")
|
||||
MessageTypes.loadMessageFile("Data/messages.dat")
|
||||
end
|
||||
end
|
||||
pbCompileAnimations
|
||||
pbCompileTrainerEvents(mustCompile)
|
||||
pbSetTextMessages
|
||||
MessageTypes.saveMessages
|
||||
if !$INEDITOR && LANGUAGES.length>=2
|
||||
pbLoadMessages("Data/"+LANGUAGES[$PokemonSystem.language][1])
|
||||
end
|
||||
pbSetWindowText(nil) if mkxp?
|
||||
end
|
||||
|
||||
def pbCompiler
|
||||
@@ -1242,6 +1243,7 @@ def pbCompiler
|
||||
end
|
||||
# Check data files and PBS files, and recompile if any PBS file was edited
|
||||
# more recently than the data files were last created
|
||||
if !mkxp?
|
||||
for i in 0...dataFiles.length
|
||||
begin
|
||||
File.open("Data/#{dataFiles[i]}") { |file|
|
||||
@@ -1260,6 +1262,7 @@ def pbCompiler
|
||||
end
|
||||
end
|
||||
mustCompile |= (latestTextTime>=latestDataTime)
|
||||
end
|
||||
# Should recompile if holding Ctrl
|
||||
Input.update
|
||||
mustCompile = true if Input.press?(Input::CTRL)
|
||||
@@ -1273,7 +1276,7 @@ def pbCompiler
|
||||
end
|
||||
end
|
||||
# Recompile all data
|
||||
pbCompileAllData(mustCompile) { |msg| Win32API.SetWindowText(msg) }
|
||||
pbCompileAllData(mustCompile) { |msg| pbSetWindowText(msg) }
|
||||
rescue Exception
|
||||
e = $!
|
||||
raise e if "#{e.class}"=="Reset" || e.is_a?(Reset) || e.is_a?(SystemExit)
|
||||
|
||||
@@ -1416,7 +1416,7 @@ def pbCompileTrainerEvents(_mustcompile)
|
||||
changed = false
|
||||
map = mapData.getMap(id)
|
||||
next if !map || !mapData.mapinfos[id]
|
||||
Win32API.SetWindowText(_INTL("Processing map {1} ({2})",id,mapData.mapinfos[id].name))
|
||||
pbSetWindowText(_INTL("Processing map {1} ({2})",id,mapData.mapinfos[id].name))
|
||||
for key in map.events.keys
|
||||
if Time.now.to_i-t>=5
|
||||
Graphics.update
|
||||
@@ -1448,7 +1448,7 @@ def pbCompileTrainerEvents(_mustcompile)
|
||||
changed = false
|
||||
Graphics.update
|
||||
commonEvents = pbLoadRxData("Data/CommonEvents")
|
||||
Win32API.SetWindowText(_INTL("Processing common events"))
|
||||
pbSetWindowText(_INTL("Processing common events"))
|
||||
for key in 0...commonEvents.length
|
||||
newevent = pbFixEventUse(commonEvents[key],0,mapData)
|
||||
if newevent
|
||||
|
||||
Reference in New Issue
Block a user