brokengamesug / rise-of-legions Goto Github PK

---
 Engine/DWScript/dwsRTTIExposer.pas        | 2 +-
 Engine/FixedDX11Header/FMX.Canvas.D2D.pas | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Engine/DWScript/dwsRTTIExposer.pas b/Engine/DWScript/dwsRTTIExposer.pas
index ca9f1e6..e8c3533 100644
--- a/Engine/DWScript/dwsRTTIExposer.pas
+++ b/Engine/DWScript/dwsRTTIExposer.pas
@@ -209,7 +209,7 @@ implementation
 // ------------------------------------------------------------------
 // ------------------------------------------------------------------
 const
-  {$IFDEF VER330}
+  {$IF CompilerVersion >= 33.0}
   cTYPEKIND_NAMES : array [TTypeKind] of string = (
     'Unknown', 'Integer', 'Char', 'Enumeration', 'Float',
     'String', 'Set', 'Class', 'Method', 'WChar', 'LString', 'WString',
diff --git a/Engine/FixedDX11Header/FMX.Canvas.D2D.pas b/Engine/FixedDX11Header/FMX.Canvas.D2D.pas
index 7b047b3..1a5f118 100644
--- a/Engine/FixedDX11Header/FMX.Canvas.D2D.pas
+++ b/Engine/FixedDX11Header/FMX.Canvas.D2D.pas
@@ -2550,13 +2550,15 @@ begin
     else
       Result := FFontDescriptors[AFont.Family];
     if not AFont.StyleExt.Slant.IsRegular then
-      Result.Style := Result.Style or DWRITE_FONT_STYLE_OBLIQUE;
+    //Result.Style := Result.Style or DWRITE_FONT_STYLE_OBLIQUE;
+      Result.Style := DWRITE_FONT_STYLE_OBLIQUE;
   end;
   if not AFont.StyleExt.IsRegular then
   begin
     Result.Weight := FontWeightToDWrite(AFont.StyleExt.Weight);
     Result.Stretch := FontStretchToDWrite(AFont.StyleExt.Stretch);
-    Result.Style := Result.Style or FontSlantToDWrite(AFont.StyleExt.Slant);
+    //Result.Style := Result.Style or FontSlantToDWrite(AFont.StyleExt.Slant);
+    Result.Style := FontSlantToDWrite(AFont.StyleExt.Slant);
   end;
 end;