minor fixes

parmaja · Apr 9, 2022 · ba1f1b3 · ba1f1b3
1 parent 2b096e2
commit ba1f1b3
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 12 deletions.
diff --git a/src/TyroLua.pas b/src/TyroLua.pas
@@ -105,6 +105,7 @@   TLuaScript = class(TTyroScript)
     function DrawPoint_func(L: Plua_State): Integer; cdecl;
     //global functions
     function Print_func(L: Plua_State): Integer; cdecl;
+    function PrintLn_func(L: Plua_State): Integer; cdecl;
 
     function Beep_func(L: Plua_State): Integer; cdecl;
     function PlaySound_func(L: Plua_State): Integer; cdecl;
@@ -472,6 +473,7 @@ constructor TLuaScript.Create;
   lua_register(LuaState, 'log', @log_func);
   lua_register(LuaState, 'sleep', @sleep_func);
   lua_register_method(LuaState, 'print', @Print_func);
+  lua_register_method(LuaState, 'println', @PrintLn_func);
   lua_register_method(LuaState, 'window', @Window_func);
   lua_register_method(LuaState, 'showconsole', @ShowConsole_func);
 
@@ -684,7 +686,16 @@ function TLuaScript.Print_func(L: Plua_State): Integer; cdecl;
   s: string;
 begin
   s := lua_tostring(L, 1);
-  AddQueueObject(TPrintObject.Create(Main.Canvas, s));
+  AddQueueObject(TPrintObject.Create(Main.Canvas, s, False));
+  Result := 0;
+end;
+
+function TLuaScript.PrintLn_func(L: Plua_State): Integer; cdecl;
+var
+  s: string;
+begin
+  s := lua_tostring(L, 1);
+  AddQueueObject(TPrintObject.Create(Main.Canvas, s, True));
   Result := 0;
 end;
 

diff --git a/src/TyroPascal.pas b/src/TyroPascal.pas
@@ -485,7 +485,7 @@ function TPasScript.DrawPoint_func(x, y: integer): Integer;
 
 function TPasScript.Print_func(s: string): Integer;
 begin
-  AddQueueObject(TPrintObject.Create(Main.Canvas, s));
+  AddQueueObject(TPrintObject.Create(Main.Canvas, s, False));
   Result := 0;
 end;
 

diff --git a/src/TyroScripts.pas b/src/TyroScripts.pas
@@ -143,7 +143,8 @@   TDrawTextObject = class(TDrawObject)
   TPrintObject = class(TDrawObject)
   public
     FText: String;
-    constructor Create(ACanvas: TTyroCanvas; Text: String);
+    FNewLine: Boolean;
+    constructor Create(ACanvas: TTyroCanvas; Text: String; NewLine: Boolean);
     procedure DoExecute; override;
   end;
 
@@ -526,15 +527,19 @@ procedure TDrawRectangleObject.DoExecute;
 
 { TPrintObject }
 
-constructor TPrintObject.Create(ACanvas: TTyroCanvas; Text: String);
+constructor TPrintObject.Create(ACanvas: TTyroCanvas; Text: String; NewLine: Boolean);
 begin
   inherited Create(ACanvas);
   fText := Text;
+  fNewLine := NewLine;
 end;
 
 procedure TPrintObject.DoExecute;
 begin
-  Main.Console.Writeln(fText);
+  if FNewLine then
+    Main.Console.Writeln(fText)
+  else
+    Main.Console.Write(fText);
 end;
 
 { TDrawTextObject }

diff --git a/src/tyro.lpi b/src/tyro.lpi
@@ -148,6 +148,10 @@
         <Filename Value="tyrolib\TyroClasses.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit>
+      <Unit>
+        <Filename Value="TyroConsoles.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit>
     </Units>
   </ProjectOptions>
   <CompilerOptions>

diff --git a/src/tyro.lpr b/src/tyro.lpr
@@ -25,10 +25,9 @@
   {$IFDEF UNIX}
   cthreads,
   {$ENDIF}
-  SysUtils, Classes, CustApp, RayLib, RayClasses,
-  mnUtils, Melodies, TyroControls, TyroClasses,
-  TyroEditors, mnLogs, TyroSounds, TyroEngines,
-  TyroLua, TyroPascal, TyroScripts;  //Add all languages units here
+  SysUtils, Classes, CustApp, RayLib, RayClasses, mnUtils, Melodies,
+  TyroControls, TyroClasses, TyroEditors, mnLogs, TyroSounds, TyroEngines,
+  TyroLua, TyroPascal, TyroScripts, TyroConsoles;  //Add all languages units here
 
 type
 
@@ -211,9 +210,17 @@ procedure TTyroApplication.DoRun;
 begin
   inherited;
   try
-    Main.Run;
+    try
+      Main.Run;
+    except
+      on E:Exception do
+      begin
+        if IsConsole then
+          WriteLn(E.Message);
+      end;
+    end;
+  finally
     Terminate;
-  except
   end;
 end;
 

diff --git a/src/tyrolib/TyroControls.pas b/src/tyrolib/TyroControls.pas
@@ -788,8 +788,8 @@ function TTyroWindow.CreateCanvas: TTyroCanvas;
 end;
 
 initialization
-finalization
   Randomize;
+finalization
   FreeAndNil(Main);
 end.