cleanup: move init and main loop code from g_window

[d2df-sdl.git] / src / game / sdl / g_system.pas

diff --git a/src/game/sdl/g_system.pas b/src/game/sdl/g_system.pas
index 0fcad1aec0afa596a05959c9388e5de33f7ff502..99b338cdc92f3d610c22a7d555c46c75f3070854 100644 (file)
--- a/src/game/sdl/g_system.pas
+++ b/src/game/sdl/g_system.pas
@@ -37,6 +37,9 @@ interface
   procedure sys_Init;
   procedure sys_Final;
 
+  var (* hooks *)
+    sys_CharPress: procedure (ch: AnsiChar) = nil;
+
 implementation
 
   uses
@@ -48,8 +51,8 @@ implementation
     {$ENDIF}
     SysUtils, SDL, Math,
     {$INCLUDE ../nogl/noGLuses.inc}
-    e_log, e_graphics, e_input, e_sound,
-    g_options, g_window, g_console, g_game, g_menu, g_gui, g_main, g_basic;
+    e_log, r_graphics, e_input, e_sound,
+    g_options, g_console, g_game, g_menu, g_gui, g_basic;
 
   const
     GameTitle = 'Doom 2D: Forever (SDL 1.2, %s, %s)';
@@ -78,17 +81,27 @@ implementation
   (* --------- Graphics --------- *)
 
   function LoadGL: Boolean;
+    var ltmp: Integer;
   begin
     result := true;
     {$IFDEF NOGL_INIT}
-    nogl_Init;
-    if glRenderToFBO and (not nogl_ExtensionSupported('GL_OES_framebuffer_object')) then
+      nogl_Init;
+      if glRenderToFBO and (not nogl_ExtensionSupported('GL_OES_framebuffer_object')) then
+      begin
+        e_LogWriteln('GL: framebuffer objects not supported; disabling FBO rendering');
+        glRenderToFBO := false;
+      end;
     {$ELSE}
-    if glRenderToFBO and (not Load_GL_ARB_framebuffer_object) then
+      if glRenderToFBO and (not Load_GL_ARB_framebuffer_object) then
+      begin
+        e_LogWriteln('GL: framebuffer objects not supported; disabling FBO rendering');
+        glRenderToFBO := false;
+      end;
     {$ENDIF}
+    if SDL_GL_GetAttribute(SDL_GL_STENCIL_SIZE, ltmp) = 0 then
     begin
-      e_LogWriteln('GL: framebuffer objects not supported; disabling FBO rendering');
-      glRenderToFBO := false;
+      e_LogWritefln('stencil buffer size: %s', [ltmp]);
+      gwin_has_stencil := (ltmp > 0);
     end;
   end;
 
@@ -636,8 +649,9 @@ implementation
     begin
       g_Console_ProcessBindRepeat(key)
     end;
-    if down and IsValid1251(ev.keysym.unicode) and IsPrintable1251(ch) then
-      CharPress(ch)
+    if @sys_CharPress <> nil then
+      if down and IsValid1251(ev.keysym.unicode) and IsPrintable1251(ch) then
+        sys_CharPress(ch)
   end;
 
   procedure HandleResize (var ev: TSDL_ResizeEvent);