diff --git a/TuBS/TuBS.sln b/TuBS/TuBS.sln
index 54db5c2..f88b8b5 100644
--- a/TuBS/TuBS.sln
+++ b/TuBS/TuBS.sln
@@ -16,6 +16,6 @@ Global
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
description = Berwick Saga translation tool.
- version = 1.3
+ version = 1.4
EndGlobalSection
EndGlobal
diff --git a/TuBS/TuBS.userprefs b/TuBS/TuBS.userprefs
index 6689aa8..87e8bd1 100644
--- a/TuBS/TuBS.userprefs
+++ b/TuBS/TuBS.userprefs
@@ -3,23 +3,23 @@
-
-
-
-
+
+
+
+
-
+
-
-
+
+
-
+
diff --git a/TuBS/TuBS/ExportScript.cs b/TuBS/TuBS/ExportScript.cs
index bccd2f0..498ec62 100644
--- a/TuBS/TuBS/ExportScript.cs
+++ b/TuBS/TuBS/ExportScript.cs
@@ -139,7 +139,6 @@ class Scene
{
ushort upper_actor;
ushort lower_actor;
- ushort last_actor;
public string Window;
public bool Active = false;
@@ -148,19 +147,16 @@ public void SetActor (ushort id)
Active = true;
if (Window == "Upper Window")
upper_actor = id;
- if (Window == "Lower Window")
+ else //"Lower Window"
lower_actor = id;
- last_actor = id;
}
public string GetActor ()
{
if (Window == "Upper Window")
return Cast.GetActorById (upper_actor);
- else if (Window == "Lower Window")
+ else //if (Window == "Lower Window")
return Cast.GetActorById (lower_actor);
-
- return Cast.GetActorById (last_actor);
}
}
diff --git a/TuBS/TuBS/ImportScript.cs b/TuBS/TuBS/ImportScript.cs
index acf5487..7e34b9a 100644
--- a/TuBS/TuBS/ImportScript.cs
+++ b/TuBS/TuBS/ImportScript.cs
@@ -140,7 +140,7 @@ protected List ScriptReader (string script_file)
} else
cir_match = cir_match.NextMatch ();
writer.Write (ushort.Parse (cir_match.Groups [1].Value));
- i += cir_match.Length - 1;
+ i = cir_match.Index + cir_match.Length - 1;
} else {
i--;
writer.Write (FindChar ('●', code_page, original_code_page));
diff --git a/TuBS/TuBS/MainWindow.cs b/TuBS/TuBS/MainWindow.cs
index f8255cc..0c06be2 100644
--- a/TuBS/TuBS/MainWindow.cs
+++ b/TuBS/TuBS/MainWindow.cs
@@ -20,8 +20,6 @@ public MainWindow () : base (Gtk.WindowType.Toplevel)
progressbar.Text = "Status: " + pathdat4 + " not found";
if (!File.Exists (pathdat3))
progressbar.Text = "Status: " + pathdat3 + " not found";
-// if (File.Exists ("list.txt"))
-// ReadImportList ();
foreach (string list in Directory.EnumerateFiles(Directory.GetCurrentDirectory (), "list*.txt", SearchOption.TopDirectoryOnly))
ReadImportList (list);
}
diff --git a/TuBS/TuBS/TuBS.csproj b/TuBS/TuBS/TuBS.csproj
index f16456c..ee9888c 100644
--- a/TuBS/TuBS/TuBS.csproj
+++ b/TuBS/TuBS/TuBS.csproj
@@ -8,7 +8,7 @@
TuBS
TuBS
Berwick Saga translation tool.
- 1.3
+ 1.4
v4.5