last tweaks

Torwent · Torwent · commit 893eaa8bf22b · 2026-02-08T15:14:47.000+01:00
diff --git a/Source/ide/simba.form_output.pas b/Source/ide/simba.form_output.pas
@@ -251,11 +251,12 @@ procedure TSimbaOutputBox.DoSpecialLineMarkup(Sender: TObject; Line: Integer; va
 begin
   lineData := PLineFlagsData(Lines.Objects[Line - 1]);
 
-  if lineData = nil then
-  begin
-    Special := False;
-    Exit;
-  end;
+  //99.99% sure there's no need to check, should never be nil
+  //if lineData = nil then
+  //begin
+  //  Special := False;
+  //  Exit;
+  //end;
 
   if EDebugLn.BACKGROUND_COLOR in lineData^.Flags then
   begin
diff --git a/Source/script/simba.script_runner.pas b/Source/script/simba.script_runner.pas
@@ -44,7 +44,7 @@ implementation
 procedure TSimbaScriptRunner.DoDebugLn(Flags: EDebugLnFlags; color: EDebugLnColor; Text: String);
 begin
   if (SimbaProcessType = ESimbaProcessType.SCRIPT_WITH_COMMUNICATION) then // Only add flags if we have communication with simba to use them
-    DebugLn(Flags, Text)
+    DebugLn(Flags, GetLineColor(color), Text)
   else
   begin
     if Application.HasOption('silent') then
diff --git a/Source/simba.base.pas b/Source/simba.base.pas
@@ -468,24 +468,37 @@ function FlagsToByte(const flags: EDebugLnFlags): Byte; inline;
 
 function FlagsToString(const flags: EDebugLnFlags; const bgColor: TColor): String; inline;
 begin
-  Result := DebugLnFlagsHeader;
-  Result := Result + Chr(FlagsToByte(flags));
+  Result := DebugLnFlagsHeader + Chr(FlagsToByte(flags));
   if (EDebugLn.BACKGROUND_COLOR in flags) then
-    Result := Result + Chr((bgColor shr 16) and $FF) +
-                       Chr((bgColor shr 8) and $FF) +
-                       Chr(bgColor and $FF);
+    Result += Format('%.6X', [bgColor])
+  else
+    Result += '000000';
 end;
 
 function FlagsFromString(var str: String; out bgColor: TColor): EDebugLnFlags;
-  function _HexToColor(const hex: String): TColor;
+  function HexToColor(P: PChar): TColor; inline;
+  var
+    N, I: Integer;
+    Val: Char;
   begin
-    if Length(hex) = 6 then
-      Result := (StrToInt('$' + Copy(hex,1,2)) shl 16) or
-                (StrToInt('$' + Copy(hex,3,2)) shl 8)  or
-                 StrToInt('$' + Copy(hex,5,2))
-    else
-      Result := 0;
+    Result := 0;
+
+    for I := 1 to 6 do
+    begin
+      Val := P^;
+      case Val of
+        '0'..'9': N := Ord(Val) - (Ord('0'));
+        'a'..'f': N := Ord(Val) - (Ord('a') - 10);
+        'A'..'F': N := Ord(Val) - (Ord('A') - 10);
+        else
+          Exit(0);
+      end;
+      Inc(P);
+
+      Result := Result*16+N;
+    end;
   end;
+
 var
   flagsByte: Byte;
 begin
@@ -500,16 +513,15 @@ function FlagsFromString(var str: String; out bgColor: TColor): EDebugLnFlags;
     //maybe in the future... would like multi color support per line
 
     if EDebugLn.BACKGROUND_COLOR in Result then
-    begin
-      bgColor := _HexToColor(Copy(str, 4, 6));
-    end
+      bgColor := HexToColor(@Str[4])
     else
       bgColor := $0;
 
     Delete(str, 1, DebugLnFlagsHeaderLength);
   end;
 end;
 
+
 function InRange(const AValue, AMin, AMax: Integer): Boolean;
 begin
   Result := (AValue >= AMin) and (AValue <= AMax);
