X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_main.pas;h=86c5f843a0cdc5c7db7aeb8e79573d6e3a48496d;hb=d92a9e2807dda8a533def35afa801ed975920885;hp=734ae36ff49f1d76f11d66d7930c63d7c81c5908;hpb=5368f6638623f763633157cdd4920bf2cb66fce5;p=d2df-sdl.git diff --git a/src/game/g_main.pas b/src/game/g_main.pas index 734ae36..86c5f84 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 @@ -33,16 +33,19 @@ var ModelsDir: string; GameWAD: string; - implementation uses - SDL2, GL, GLExt, wadreader, e_log, g_window, +{$INCLUDE ../nogl/noGLuses.inc} +{$IFDEF ENABLE_HOLMES} + g_holmes, fui_wadread, fui_style, fui_gfx_gl, +{$ENDIF} + SDL2, wadreader, e_log, g_window, e_graphics, e_input, g_game, g_console, g_gui, - e_sound, g_options, g_sound, g_player, + e_sound, g_options, g_sound, g_player, g_basic, g_weapons, SysUtils, g_triggers, MAPDEF, g_map, - g_menu, g_language, g_net, g_holmes, - utils, conbuf, envvars, fui_wadread, fui_style, + g_menu, g_language, g_net, g_touch, + utils, conbuf, envvars, xparser; @@ -52,6 +55,9 @@ var procedure Main(); var sdlflags: LongWord; +{$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)} + flexloaded: Boolean; +{$ENDIF} begin e_InitWritelnDriver(); @@ -63,21 +69,21 @@ begin e_InitLog(GameDir + '/' + LOG_FILENAME, TWriteMode.WM_NEWFILE); - e_WriteLog('Read config file', TMsgType.Notify); - g_Options_Read(GameDir + '/' + CONFIG_FILENAME); + e_WriteLog( + 'Doom 2D: Forever version ' + GAME_VERSION + + ' proto ' + IntToStr(NET_PROTOCOL_VER), + TMsgType.Notify + ); + e_WriteLog( + 'Build date: ' + GAME_BUILDDATE + ' ' + GAME_BUILDTIME, + TMsgType.Notify + ); {$IFDEF HEADLESS} conbufDumpToStdOut := true; {$ENDIF} e_WriteToStdOut := False; //{$IFDEF HEADLESS}True;{$ELSE}False;{$ENDIF} - //GetSystemDefaultLCID() - - //e_WriteLog('Read language file', MSG_NOTIFY); - //g_Language_Load(DataDir + gLanguage + '.txt'); - e_WriteLog(gLanguage, TMsgType.Notify); - g_Language_Set(gLanguage); - {$IFDEF HEADLESS} {$IFDEF USE_SDLMIXER} sdlflags := SDL_INIT_TIMER or SDL_INIT_AUDIO or $00004000; @@ -88,38 +94,77 @@ 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} {$ENDIF} + + SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, '0'); + if SDL_Init(sdlflags) < 0 then raise Exception.Create('SDL: Init failed: ' + SDL_GetError()); + e_WriteLog('Read config file', TMsgType.Notify); + g_Options_Read(GameDir + '/' + CONFIG_FILENAME); + + //GetSystemDefaultLCID() + + //e_WriteLog('Read language file', MSG_NOTIFY); + //g_Language_Load(DataDir + gLanguage + '.txt'); + e_WriteLog(gLanguage, TMsgType.Notify); + g_Language_Set(gLanguage); + {$IFNDEF HEADLESS} +{$IFNDEF ANDROID} SDL_StartTextInput(); {$ENDIF} +{$ENDIF} -{$IFNDEF HEADLESS} +{$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)} + 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'); - g_holmes_imfunctional := false; - except on e: TParserException do + fuiGfxLoadFont('win8', 'flexui/fonts/win8.fuifont'); + fuiGfxLoadFont('win14', 'flexui/fonts/win14.fuifont'); + fuiGfxLoadFont('win16', 'flexui/fonts/win16.fuifont'); + fuiGfxLoadFont('dos8', 'flexui/fonts/dos8.fuifont'); + fuiGfxLoadFont('msx6', 'flexui/fonts/msx6.fuifont'); + except on e: Exception do begin - writeln('ERROR at (', e.tokLine, ',', e.tokCol, '): ', e.message); + 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); @@ -154,11 +199,14 @@ begin e_WriteLog('Init Input', TMsgType.Notify); e_InitInput(); + g_Touch_Init; +(* if (e_JoysticksAvailable > 0) then e_WriteLog('Input: Joysticks available.', TMsgType.Notify) else e_WriteLog('Input: No Joysticks.', TMsgType.Notify); +*) if (not gNoSound) then begin @@ -348,9 +396,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; @@ -444,33 +490,14 @@ var Msg: g_gui.TMessage; begin case K of - IK_PAUSE: // : - begin - if (g_ActiveWindow = nil) then g_Game_Pause(not gPause); - end; - - IK_BACKQUOTE: // <`/~/¨/¸>: - begin - g_Console_Switch(); - end; - - IK_ESCAPE: // : + VK_ESCAPE: // : begin - if gChatShow then - begin - g_Console_Chat_Switch(); - Exit; - end; - - if gConsoleShow then - begin - g_Console_Switch(); - end - else if (g_ActiveWindow <> nil) then + if (g_ActiveWindow <> nil) then begin Msg.Msg := WM_KEYDOWN; - Msg.WParam := IK_ESCAPE; + Msg.WParam := VK_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 @@ -500,7 +527,7 @@ begin begin // .. � 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(); @@ -542,11 +569,9 @@ var Msg: g_gui.TMessage; a: Integer; begin - if (not gChatShow) and ((C = '`') or (C = '~') or (C = '¸') or (C = '¨')) then Exit; - if gConsoleShow or gChatShow then begin - g_Console_Char(C); + g_Console_Char(C) end else if (g_ActiveWindow <> nil) then begin