X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_main.pas;h=ac2495448ed9caf0cefec0dd91ceb0c7b010ea63;hb=fb8592aa898a8da05a47bfe50ff8272de4fdc995;hp=2a444ead437b2e2e6cad6313405e344d309ed38d;hpb=7da841038d5a4e415324d4441cd397f6664e892d;p=d2df-sdl.git

diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index 2a444ea..ac24954 100644
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
@@ -1,4 +1,4 @@
-(* Copyright (C)  DooM 2D:Forever Developers
+(* Copyright (C)  Doom 2D: Forever Developers
  *
  * 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
@@ -52,6 +52,9 @@ var
 procedure Main();
 var
   sdlflags: LongWord;
+{$IFNDEF HEADLESS}
+  flexloaded: Boolean;
+{$ENDIF}
 begin
   e_InitWritelnDriver();
 
@@ -88,7 +91,8 @@ begin
  {$ENDIF}
 {$ELSE}
  {$IFDEF USE_SDLMIXER}
-  sdlflags := SDL_INIT_EVERYTHING;
+  {*sdlflags := SDL_INIT_EVERYTHING;*}
+  sdlflags := SDL_INIT_JOYSTICK or SDL_INIT_TIMER or SDL_INIT_VIDEO;
  {$ELSE}
   sdlflags := SDL_INIT_JOYSTICK or SDL_INIT_TIMER or SDL_INIT_VIDEO;
  {$ENDIF}
@@ -101,39 +105,48 @@ begin
 {$ENDIF}
 
 {$IFNDEF HEADLESS}
+  flexloaded := true;
   if not fuiAddWad('flexui.wad') then
   begin
     if not fuiAddWad('./data/flexui.wad') then fuiAddWad('./flexui.wad');
   end;
-  g_holmes_imfunctional := true;
-  try
-    e_LogWriteln('FlexUI: loading stylesheet...');
-    uiLoadStyles('flexui/widgets.wgs');
-  except on e: TParserException do
-    begin
-      writeln('ERROR at (', e.tokLine, ',', e.tokCol, '): ', e.message);
-      //raise;
-    end;
-  else
-    begin
-      //raise;
-    end;
-  end;
   try
     fuiGfxLoadFont('win8', 'flexui/fonts/win8.fuifont');
     fuiGfxLoadFont('win14', 'flexui/fonts/win14.fuifont');
     fuiGfxLoadFont('win16', 'flexui/fonts/win16.fuifont');
-    g_holmes_imfunctional := false;
+    fuiGfxLoadFont('dos8', 'flexui/fonts/dos8.fuifont');
+    fuiGfxLoadFont('msx6', 'flexui/fonts/msx6.fuifont');
   except on e: Exception do
     begin
       writeln('ERROR loading FlexUI fonts');
+      flexloaded := false;
       //raise;
     end;
   else
     begin
+      flexloaded := false;
       //raise;
     end;
   end;
+  if (flexloaded) then
+  begin
+    try
+      e_LogWriteln('FlexUI: loading stylesheet...');
+      uiLoadStyles('flexui/widgets.wgs');
+    except on e: TParserException do
+      begin
+        writeln('ERROR at (', e.tokLine, ',', e.tokCol, '): ', e.message);
+        //raise;
+        flexloaded := false;
+      end;
+    else
+      begin
+        //raise;
+        flexloaded := false;
+      end;
+    end;
+  end;
+  g_holmes_imfunctional := not flexloaded;
 {$ENDIF}
 
   e_WriteLog('Entering SDLMain', TMsgType.Notify);
@@ -362,9 +375,7 @@ begin
   begin
     if g_Map_Exist(MapsDir+gGameSettings.WAD+':\MAP'+s2) then
     begin
-      c := 'MAP00';
-      c[3] := s2[1];
-      c[4] := s2[2];
+      c := 'MAP'+s2;
       g_Game_ExitLevel(c);
     end;
     goto Cheated;
@@ -485,6 +496,7 @@ begin
           Msg.Msg := WM_KEYDOWN;
           Msg.WParam := IK_ESCAPE;
           g_ActiveWindow.OnMessage(Msg);
+          if (not g_Game_IsNet) and (g_ActiveWindow = nil) then g_Game_Pause(false); //Fn loves to do this
         end
         else if (gState <> STATE_FOLD) then
         begin
@@ -514,7 +526,7 @@ begin
       begin // <F2> .. <F6> � <F12>
         if gGameOn and (not gConsoleShow) and (not gChatShow) then
         begin
-          while g_ActiveWindow <> nil do g_GUI_HideWindow(False);
+          while (g_ActiveWindow <> nil) do g_GUI_HideWindow(False);
           if (not g_Game_IsNet) then g_Game_Pause(True);
           case K of
             IK_F2: g_Menu_Show_SaveMenu();