More cleanup

NTERA/Console/EraConsoleInstance.cs

@@ -141,7 +141,7 @@ namespace NTERA.Console
 
 		protected StringBuilder bodyBuilder = new StringBuilder();
 
-		public void Print(string message)
+		public void Write(string message)
 		{
 			//message.Replace(' ', '　');
 			bodyBuilder.Append(message);
@@ -192,22 +192,22 @@ namespace NTERA.Console
 
 		public void PrintButton(string something, long something1)
 		{
-			Print(something);
+			Write(something);
 		}
 
 		public void PrintButton(string something, string something1)
 		{
-			Print(something);
+			Write(something);
 		}
 
 		public void PrintButtonC(string something, long something1, bool something2)
 		{
-			Print(something);
+			Write(something);
 		}
 
 		public void PrintButtonC(string something, string something1, bool something2)
 		{
-			Print(something);
+			Write(something);
 		}
 
 		public void PrintPlain(string message)

NTERA/Game/GameData/Expression/ExpressionMediator.cs

@@ -50,7 +50,7 @@ namespace MinorShift.Emuera.GameData.Expression
 				Console.PrintSingleLine(str, false);
 			else
 			{
-				Console.Print(str);
+				Console.Write(str);
 				if (func.IsNewLine() || func.IsWaitInput())
 				{
 					Console.NewLine();

NTERA/Game/GameData/Variable/VariableEvaluator.cs

@@ -1569,7 +1569,7 @@ namespace MinorShift.Emuera.GameData.Variable
 				{
 					builder.Append('=');
 					builder.Append(param[i].ToString());
-					window.Print(builder.ToString());
+					window.Write(builder.ToString());
 					window.NewLine();
 				}
 
@@ -1624,7 +1624,7 @@ namespace MinorShift.Emuera.GameData.Variable
 				{
 					builder.Append('=');
 					builder.Append(param[i].ToString());
-					window.Print(builder.ToString());
+					window.Write(builder.ToString());
 					window.NewLine();
 				}
 			}

NTERA/Game/GameProc/ErbLoader.cs

@@ -2,13 +2,11 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Media;
-using System.Windows.Forms;
 using Microsoft.VisualBasic;
 using MinorShift.Emuera.GameData.Expression;
 using MinorShift.Emuera.GameData.Variable;
 using MinorShift.Emuera.GameProc.Function;
 using MinorShift.Emuera.Sub;
-using MinorShift._Library;
 using NTERA.Interop;
 
 namespace MinorShift.Emuera.GameProc
@@ -58,17 +56,16 @@ namespace MinorShift.Emuera.GameProc
 					string file = erbFiles[i].Value;
 #if DEBUG
 					if (displayReport)
-						output.PrintSystemLine("Elapsed time: " + stopwatch.ElapsedTicks.ToString("D4") + "ms:" + filename + " is being loaded...");
+						output.PrintSystemLine("Elapsed time: " + stopwatch.ElapsedMilliseconds.ToString("D4") + "ms:" + filename + " is being loaded...");
 #else
 					if (displayReport)
 						output.PrintSystemLine("Loading " + filename + "...");
 #endif
-					Application.DoEvents();
 					loadErb(file, filename, isOnlyEvent);
 				}
 				ParserMediator.FlushWarningList();
 #if DEBUG
-				output.PrintSystemLine("Elapsed time: " + stopwatch.ElapsedTicks.ToString("D4") + "ms:");
+				output.PrintSystemLine("Elapsed time: " + stopwatch.ElapsedMilliseconds.ToString("D4") + "ms:");
 #endif
 				if (displayReport)
 					output.PrintSystemLine("Building a list of user-defined functions...");
@@ -76,7 +73,7 @@ namespace MinorShift.Emuera.GameProc
 				ParserMediator.FlushWarningList();
 				labelDic.Initialized = true;
 #if DEBUG
-				output.PrintSystemLine("Elapsed time: " + stopwatch.ElapsedTicks.ToString("D4") + "ms:");
+				output.PrintSystemLine("Elapsed time: " + stopwatch.ElapsedMilliseconds.ToString("D4") + "ms:");
 #endif
 				if (displayReport)
 					output.PrintSystemLine("Script syntax checking...");
@@ -84,7 +81,7 @@ namespace MinorShift.Emuera.GameProc
 				ParserMediator.FlushWarningList();
 
 #if DEBUG
-				output.PrintSystemLine("Elapsed time: " + stopwatch.ElapsedTicks.ToString("D4") + "ms:");
+				output.PrintSystemLine("Elapsed time: " + stopwatch.ElapsedMilliseconds.ToString("D4") + "ms:");
 #endif
 				if (displayReport)
 					output.PrintSystemLine("Load is complete");
@@ -125,7 +122,7 @@ namespace MinorShift.Emuera.GameProc
 					fname = fpath;
 				if (Program.AnalysisMode)
 					output.PrintSystemLine("Loading " + fname + "...");
-				Application.DoEvents();
+
                 loadErb(fpath, fname, isOnlyEvent);
 			}
             if (Program.AnalysisMode)
@@ -834,7 +831,6 @@ namespace MinorShift.Emuera.GameProc
 		{//ここでエラーを捕まえることは本来はないはず。ExeEE相当。
 			try
 			{
-				Application.DoEvents();
 				string filename = label.Position.Filename.ToUpper();
 				setArgument(label);
 				nestCheck(label);

NTERA/Game/GameProc/Function/Instraction.Child.cs

@@ -228,7 +228,7 @@ namespace MinorShift.Emuera.GameProc.Function
 					var str = term.GetStrValue(exm);
 					if (func.Function.IsPrintKFunction())
 						str = exm.ConvertStringType(str);
-					exm.Console.Print(str);
+					exm.Console.Write(str);
 					if (++i < iList.Count)
 						exm.Console.NewLine();
 				}
@@ -877,7 +877,7 @@ namespace MinorShift.Emuera.GameProc.Function
 				Int64 var = barArg.Terms[0].GetIntValue(exm);
 				Int64 max = barArg.Terms[1].GetIntValue(exm);
 				Int64 length = barArg.Terms[2].GetIntValue(exm);
-				exm.Console.Print(exm.CreateBar(var, max, length));
+				exm.Console.Write(exm.CreateBar(var, max, length));
 				if (newline)
 					exm.Console.NewLine();
 			}

NTERA/Game/GameProc/HeaderFileLoader.cs

@@ -41,7 +41,6 @@ namespace MinorShift.Emuera.GameProc
 					noError = loadHeaderFile(file, filename);
 					if (!noError)
 						break;
-					Application.DoEvents();
 				}
 			}
 			finally

NTERA/Game/GameProc/Process.ScriptProc.cs

@@ -172,7 +172,7 @@ namespace MinorShift.Emuera.GameProc
 							break;
 						ExpressionArgument intExpArg = (ExpressionArgument)func.Argument;
 						Int64 target = intExpArg.Term.GetIntValue(exm);
-						exm.Console.Print(vEvaluator.GetCharacterDataString(target, func.FunctionCode));
+						exm.Console.Write(vEvaluator.GetCharacterDataString(target, func.FunctionCode));
 						exm.Console.NewLine();
 					}
 					break;
@@ -204,7 +204,7 @@ namespace MinorShift.Emuera.GameProc
 				case FunctionCode.PRINT_ITEM://所持アイテム
 					if (skipPrint)
 						break;
-					exm.Console.Print(vEvaluator.GetHavingItemsString());
+					exm.Console.Write(vEvaluator.GetHavingItemsString());
 					exm.Console.NewLine();
 					break;
 				case FunctionCode.PRINT_SHOPITEM://ショップで売っているアイテム

NTERA/Game/GameProc/Process.SystemProc.cs

@@ -809,7 +809,7 @@ namespace MinorShift.Emuera.GameProc
 			for (int i = 0; i < page; i++)
 			{
 				console.PrintFlush(false);
-				console.Print(string.Format("[{0, 2}] Display slots {0, 2}～{1, 2}", i * 20, i * 20 + 19));
+				console.Write(string.Format("[{0, 2}] Display slots {0, 2}～{1, 2}", i * 20, i * 20 + 19));
 			}
 			for (int i = 0; i < 20; i++)
 			{
@@ -818,7 +818,7 @@ namespace MinorShift.Emuera.GameProc
 					break;
 				dataIsAvailable[dataNo] = false;
 				console.PrintFlush(false);
-				console.Print(string.Format("[{0, 2}] ", dataNo));
+				console.Write(string.Format("[{0, 2}] ", dataNo));
 				if (!writeSavedataTextFrom(dataNo))
 					continue;
 				dataIsAvailable[dataNo] = true;
@@ -826,7 +826,7 @@ namespace MinorShift.Emuera.GameProc
 			for (int i = page; i < ((dataIsAvailable.Length - 2) / 20); i++)
 			{
 				console.PrintFlush(false);
-				console.Print(string.Format("[{0, 2}] Display slots {0, 2}～{1, 2}", (i + 1) * 20, (i + 1) * 20 + 19));
+				console.Write(string.Format("[{0, 2}] Display slots {0, 2}～{1, 2}", (i + 1) * 20, (i + 1) * 20 + 19));
 			}
 			//オートセーブの処理は別途切り出し（表示処理の都合上）
 			dataIsAvailable[dataIsAvailable.Length - 1] = false;
@@ -834,7 +834,7 @@ namespace MinorShift.Emuera.GameProc
 			{
 				dataNo = AutoSaveIndex;
 				console.PrintFlush(false);
-				console.Print(string.Format("[{0, 2}] ", dataNo));
+				console.Write(string.Format("[{0, 2}] ", dataNo));
 				if (writeSavedataTextFrom(dataNo))
 					dataIsAvailable[dataIsAvailable.Length - 1] = true;
 			}
@@ -1001,15 +1001,10 @@ namespace MinorShift.Emuera.GameProc
 		private bool writeSavedataTextFrom(int saveIndex)
 		{
 			EraDataResult result = vEvaluator.CheckData(saveIndex, EraSaveFileType.Normal);
-			console.Print(result.DataMes);
+			console.Write(result.DataMes);
 			console.NewLine();
 			return result.State == EraDataState.OK;
 		}
-
-		//1808 vEvaluator.SaveTo()などに移動
-		//private bool loadFrom(int dataIndex)
-		//private bool saveTo(int saveIndex, string saveText)
-		//private string getSaveDataPath(int index)
 	}
 
 }

NTERA/Interop/IConsole.cs

@@ -34,7 +34,7 @@ namespace NTERA.Interop
 		bool Enabled { get; }
 		void ThrowError(bool playSound);
 		void PrintErrorButton(string message, ScriptPosition position);
-		void Print(string message);
+		void Write(string message);
 		bool UseSetColorStyle { get; set; }
 		void PrintC(string message, bool something);
 		DisplayLineAlignment Alignment { get; set; }

NTERA/NTERA.csproj

@@ -147,7 +147,7 @@
     <Compile Include="Game\Sub\WordCollection.cs" />
     <Compile Include="Game\_Library\LangManager.cs" />
     <Compile Include="Interop\GameInstance.cs" />
-    <Compile Include="Console\HTMLParser.cs" />
+    <Compile Include="Console\HtmlParser.cs" />
     <Compile Include="Interop\IConsole.cs" />
     <Compile Include="Interop\IMainWindow.cs" />
     <Compile Include="Interop\ProgramInstance.cs" />