Merge pull request #42 from elizagamedev/gir/trNullHandling
tr Null handling:
This commit is contained in:
commit
847c399c82
|
|
@ -41,6 +41,7 @@ class Scene_Title
|
||||||
end
|
end
|
||||||
load_perma_flags
|
load_perma_flags
|
||||||
Window_Settings.load_settings
|
Window_Settings.load_settings
|
||||||
|
Oneshot.allow_exit true
|
||||||
|
|
||||||
@window_settings_title = Window_Settings.new
|
@window_settings_title = Window_Settings.new
|
||||||
# Make title graphic
|
# Make title graphic
|
||||||
|
|
@ -227,6 +228,7 @@ class Scene_Title
|
||||||
# Play decision SE
|
# Play decision SE
|
||||||
Audio.se_play('Audio/SE/title_decision.wav')
|
Audio.se_play('Audio/SE/title_decision.wav')
|
||||||
# Update map (run parallel process event)
|
# Update map (run parallel process event)
|
||||||
|
Oneshot.allow_exit false
|
||||||
$game_map.update
|
$game_map.update
|
||||||
# Switch to map screen
|
# Switch to map screen
|
||||||
$scene = Scene_Map.new
|
$scene = Scene_Map.new
|
||||||
|
|
|
||||||
|
|
@ -205,6 +205,8 @@ class Window_Message < Window_Selectable
|
||||||
# Don't do anything if we're done
|
# Don't do anything if we're done
|
||||||
return if !@drawing_text
|
return if !@drawing_text
|
||||||
|
|
||||||
|
autoMash = (Input.press?(Input::R) && $game_switches[253])
|
||||||
|
|
||||||
# Get 1 text character in c (loop until unable to get text)
|
# Get 1 text character in c (loop until unable to get text)
|
||||||
while ((c = @text.slice!(0)) != nil)
|
while ((c = @text.slice!(0)) != nil)
|
||||||
# \n
|
# \n
|
||||||
|
|
@ -227,13 +229,13 @@ class Window_Message < Window_Selectable
|
||||||
# \.
|
# \.
|
||||||
if c == "\001"
|
if c == "\001"
|
||||||
# Pause
|
# Pause
|
||||||
@text_pause = 10
|
@text_pause = autoMash ? 0 : 10
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
# \|
|
# \|
|
||||||
if c == "\002"
|
if c == "\002"
|
||||||
# Pause
|
# Pause
|
||||||
@text_pause = 10*4
|
@text_pause = autoMash ? 0 : 10*4
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
if c == "\003"
|
if c == "\003"
|
||||||
|
|
|
||||||
|
|
@ -99,7 +99,11 @@ class Language
|
||||||
else
|
else
|
||||||
rv = string
|
rv = string
|
||||||
end
|
end
|
||||||
dbg_print(string + " -> " + rv)
|
|
||||||
|
if rv.nil?
|
||||||
|
rv = "NULL"
|
||||||
|
end
|
||||||
|
#dbg_print(string + " -> " + rv)
|
||||||
return String.new(rv)
|
return String.new(rv)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue