fix stub system driver and some warnings

[d2df-sdl.git] / src / engine / e_graphics.pas

diff --git a/src/engine/e_graphics.pas b/src/engine/e_graphics.pas
index d0f967230f0c31c94f7e575f926414ed9927bc72..ca6dcf17bcbbb5565476c63f14b30e8fe3c8f2a2 100644 (file)
--- a/src/engine/e_graphics.pas
+++ b/src/engine/e_graphics.pas
@@ -2,8 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,7 +19,11 @@ interface
 
 uses
   {$INCLUDE ../nogl/noGLuses.inc}
-  SysUtils, Classes, Math, e_log, e_texture, SDL2, MAPDEF, ImagingTypes, Imaging, ImagingUtility;
+  {$IFDEF USE_SDL2}
+    SDL2,
+  {$ENDIF}
+  SysUtils, Classes, Math, e_log, e_texture,
+  MAPDEF, ImagingTypes, Imaging, ImagingUtility;
 
 type
   TMirrorType=(None, Horizontal, Vertical);
@@ -115,7 +118,8 @@ procedure e_TextureFontKill(FontID: DWORD);
 procedure e_TextureFontPrint(X, Y: GLint; Text: string; FontID: DWORD);
 procedure e_TextureFontPrintEx(X, Y: GLint; Text: string; FontID: DWORD; Red, Green,
                                Blue: Byte; Scale: Single; Shadow: Boolean = False);
-procedure e_TextureFontPrintFmt(X, Y: GLint; Text: string; FontID: DWORD; Shadow: Boolean = False);
+procedure e_TextureFontPrintFmt(X, Y: GLint; Text: string; FontID: DWORD;
+                                Shadow: Boolean = False; Newlines: Boolean = False);
 procedure e_TextureFontGetSize(ID: DWORD; out CharWidth, CharHeight: Byte);
 procedure e_RemoveAllTextureFont();
 
@@ -128,8 +132,10 @@ procedure e_Clear(Mask: TGLbitfield; Red, Green, Blue: Single); overload;
 procedure e_Clear(); overload;
 procedure e_EndRender();
 
+{$IFDEF USE_SDL2}
 function e_GetGamma(win: PSDL_Window): Byte;
 procedure e_SetGamma(win: PSDL_Window;Gamma: Byte);
+{$ENDIF}
 
 procedure e_MakeScreenshot(st: TStream; Width, Height: Word);
 
@@ -1113,6 +1119,7 @@ begin
   glPopMatrix();
 end;
 
+{$IFDEF USE_SDL2}
 function e_GetGamma(win: PSDL_Window): Byte;
 var
   ramp: array [0..256*3-1] of Word;
@@ -1175,6 +1182,7 @@ begin
 
  SDL_SetWindowGammaRamp(win, @ramp[0], @ramp[256], @ramp[512]);
 end;
+{$ENDIF}
 
 function e_CharFont_Create(sp: ShortInt=0): DWORD;
 var
@@ -1496,8 +1504,10 @@ end;
 procedure e_TextureFontBuild(Tex: DWORD; var FontID: DWORD; XCount, YCount: Word;
                              Space: ShortInt=0);
 var
+{$IF not DEFINED(USE_NANOGL) and not DEFINED(USE_NOGL)}
   loop1 : GLuint;
   cx, cy : real;
+{$ENDIF}
   i, id: DWORD;
 begin
  if e_NoGraphics then Exit;
@@ -1685,11 +1695,12 @@ begin
   result := e_TextureFonts[FontID].CharWidth;
 end;
 
-procedure e_TextureFontPrintFmt(X, Y: GLint; Text: string; FontID: DWORD; Shadow: Boolean = False);
+procedure e_TextureFontPrintFmt(X, Y: GLint; Text: string; FontID: DWORD;
+                                Shadow: Boolean = False; Newlines: Boolean = False);
 var
   a, TX, TY, len: Integer;
   tc, c: TRGB;
-  w: Word;
+  w, h: Word;
 begin
   if e_NoGraphics then Exit;
   if Text = '' then Exit;
@@ -1705,6 +1716,7 @@ begin
   len := Length(Text);
 
   w := e_TextureFonts[FontID].CharWidth;
+  h := e_TextureFonts[FontID].CharHeight;
 
   with e_TextureFonts[FontID] do
   begin
@@ -1721,12 +1733,15 @@ begin
     for a := 1 to len do
     begin
       case Text[a] of
-        {#10: // line feed
+        #10: // line feed
         begin
-          TX := X;
-          TY := TY + h;
-          continue;
-        end;}
+          if Newlines then
+          begin
+            TX := X;
+            TY := TY + h;
+            continue;
+          end;
+        end;
         #1: // black
         begin
           c.R := 0; c.G := 0; c.B := 0;