X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_main.pas;h=ccad27b86c8e700b0b8ecaa43ff0f4d00d7a44b3;hb=7ab0e3623e342566a036b71b847b629e26ee56e1;hp=57f12e98a45349501ccb52fd666817503eae7731;hpb=7817748b82c4e9ef6b16e1b6670d342db07a7e83;p=d2df-sdl.git diff --git a/src/game/g_main.pas b/src/game/g_main.pas index 57f12e9..ccad27b 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 @@ -32,17 +32,22 @@ var MapsDir: string; ModelsDir: string; GameWAD: string; - + gSkipFirstChar: Boolean; (* hack for console/chat input *) 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, - utils, conbuf, envvars; + g_menu, g_language, g_net, g_touch, + utils, conbuf, envvars, + xparser; var @@ -51,6 +56,9 @@ var procedure Main(); var sdlflags: LongWord; +{$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)} + flexloaded: Boolean; +{$ENDIF} begin e_InitWritelnDriver(); @@ -62,21 +70,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; @@ -87,17 +95,78 @@ 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} + +{$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; + try + 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 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); @@ -105,7 +174,7 @@ begin SDLMain(); {$WARNINGS ON} -{$IFDEF HEADLESS} +{$IFNDEF HEADLESS} SDL_StopTextInput(); {$ENDIF} @@ -131,6 +200,7 @@ begin e_WriteLog('Init Input', TMsgType.Notify); e_InitInput(); + g_Touch_Init; if (e_JoysticksAvailable > 0) then e_WriteLog('Input: Joysticks available.', TMsgType.Notify) @@ -325,9 +395,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; @@ -426,12 +494,13 @@ begin if (g_ActiveWindow = nil) then g_Game_Pause(not gPause); end; - IK_BACKQUOTE: // <`/~/¨/¸>: + IK_BACKQUOTE, VK_CONSOLE: // <`/~/¨/¸>: begin - g_Console_Switch(); + if not gChatShow then + g_Console_Switch() end; - IK_ESCAPE: // : + IK_ESCAPE, VK_ESCAPE: // : begin if gChatShow then begin @@ -448,6 +517,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 @@ -477,7 +547,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(); @@ -519,6 +589,12 @@ var Msg: g_gui.TMessage; a: Integer; begin + if gSkipFirstChar then + begin + gSkipFirstChar := False; + Exit + end; + if (not gChatShow) and ((C = '`') or (C = '~') or (C = '¸') or (C = '¨')) then Exit; if gConsoleShow or gChatShow then