snxrzx/mkxp-sunshine
1
0
Fork 0
mirror of https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git synced 2026-08-22 23:06:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing mklang file problems on windows and adding some errors to catch in SaveLoad

Browse source
This commit is contained in:
mshirt 2017-05-07 15:18:29 -07:00
parent 8105180d01
commit 4c61892e2e
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -16,3 +16,5 @@ Makefile*
object_script.* object_script.*
rpgscript.bat rpgscript.bat
oneshot_JA_2_merge.pot
rpgscript - mklang.bat

3
mklang.rb
View file

@ -1,4 +1,5 @@
#!/usr/bin/ruby #!/usr/bin/ruby
#encoding: utf-8
require 'get_pomo' require 'get_pomo'
require 'zlib' require 'zlib'
@ -11,7 +12,7 @@ end
src_file = ARGV[0] src_file = ARGV[0]
dst_file = ARGV[1] dst_file = ARGV[1]
po = GetPomo::PoFile.parse(File.read(src_file)) po = GetPomo::PoFile.parse(File.read(src_file, :encoding => 'utf-8'))
File.open(dst_file, 'wb') do |file| File.open(dst_file, 'wb') do |file|
file.write(Marshal.dump(po.map do |t| file.write(Marshal.dump(po.map do |t|

8
scripts/SaveLoad.rb
View file

@ -163,7 +163,7 @@ def load_perma_flags
begin begin
read_perma_flags(PERMA_FLAGS_NAME) read_perma_flags(PERMA_FLAGS_NAME)
rescue TypeError => e rescue TypeError, ArgumentError => e
puts "oops: #{e.message}" puts "oops: #{e.message}"
EdText.err("p-settings.dat corrupt. Attempting to load backup.") EdText.err("p-settings.dat corrupt. Attempting to load backup.")
for i in 1..6 for i in 1..6
@ -177,7 +177,7 @@ def load_perma_flags
begin begin
read_perma_flags(Oneshot::SAVE_PATH + "\\save_backups\\p-settings" + (i).to_s + ".bk") read_perma_flags(Oneshot::SAVE_PATH + "\\save_backups\\p-settings" + (i).to_s + ".bk")
break break
rescue TypeError => e2 rescue TypeError, ArgumentError => e2
puts "oops: #{e2.message}" puts "oops: #{e2.message}"
EdText.err("p-settings" + (i).to_s + ".bk corrupt. Attempting to load backup.") EdText.err("p-settings" + (i).to_s + ".bk corrupt. Attempting to load backup.")
end end
@ -210,7 +210,7 @@ def real_load
#load save data #load save data
begin begin
load(SAVE_FILE_NAME) load(SAVE_FILE_NAME)
rescue TypeError => e rescue TypeError, ArgumentError => e
puts "oops: #{e.message}" puts "oops: #{e.message}"
EdText.err("save.dat corrupt. Attempting to load backup.") EdText.err("save.dat corrupt. Attempting to load backup.")
for i in 1..6 for i in 1..6
@ -224,7 +224,7 @@ def real_load
begin begin
load(Oneshot::SAVE_PATH + "\\save_backups\\save" + (i).to_s + ".bk") load(Oneshot::SAVE_PATH + "\\save_backups\\save" + (i).to_s + ".bk")
break break
rescue TypeError => e2 rescue TypeError, ArgumentError => e2
puts "oops: #{e2.message}" puts "oops: #{e2.message}"
EdText.err("save" + (i).to_s + ".bk corrupt. Attempting to load backup.") EdText.err("save" + (i).to_s + ".bk corrupt. Attempting to load backup.")
end end