X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_main.pas;h=d60f2ddaa6de5fbf4940eff6a8d95f0e473b4299;hb=0e101bd452c40da601236aaa2dd4106be47ddce1;hp=2758377eb4ad627d15e5f646705b5b740724bd1e;hpb=1bddfaf7b6421f1659a6f211dfdb1dfaef5d5173;p=d2df-sdl.git diff --git a/src/game/g_main.pas b/src/game/g_main.pas index 2758377..d60f2dd 100644 --- a/src/game/g_main.pas +++ b/src/game/g_main.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 @@ -32,18 +31,25 @@ var MapsDir: string; ModelsDir: string; GameWAD: string; - + LogFileName: 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} +{$IFDEF USE_SDL2} + SDL2, +{$ENDIF} + 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, - fui_gfx_gl, xparser; + g_menu, g_language, g_net, g_touch, g_system, g_res_downloader, + utils, conbuf, envvars, + xparser; var @@ -52,7 +58,7 @@ var procedure Main(); var sdlflags: LongWord; -{$IFNDEF HEADLESS} +{$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)} flexloaded: Boolean; {$ENDIF} begin @@ -64,23 +70,24 @@ begin ModelsDir := DataDir + 'models/'; GameWAD := DataDir + 'Game.wad'; - e_InitLog(GameDir + '/' + LOG_FILENAME, TWriteMode.WM_NEWFILE); + e_InitLog(GameDir + '/' + LogFileName, 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 USE_SDL2} {$IFDEF HEADLESS} {$IFDEF USE_SDLMIXER} sdlflags := SDL_INIT_TIMER or SDL_INIT_AUDIO or $00004000; @@ -91,19 +98,34 @@ 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()); +{$ENDIF} -{$IFNDEF HEADLESS} - SDL_StartTextInput(); + 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 USE_SDL2} + sys_Init; {$ENDIF} -{$IFNDEF HEADLESS} +{$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)} flexloaded := true; if not fuiAddWad('flexui.wad') then begin @@ -148,18 +170,20 @@ begin g_holmes_imfunctional := not flexloaded; {$ENDIF} + //g_Res_CreateDatabases(); // it will be done before connecting to the server for the first time + e_WriteLog('Entering SDLMain', TMsgType.Notify); {$WARNINGS OFF} SDLMain(); {$WARNINGS ON} -{$IFNDEF HEADLESS} - SDL_StopTextInput(); -{$ENDIF} - +{$IFDEF USE_SDL2} e_WriteLog('Releasing SDL', TMsgType.Notify); SDL_Quit(); +{$ELSE} + sys_Final; +{$ENDIF} end; procedure Init(); @@ -180,11 +204,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 @@ -374,9 +401,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; @@ -466,36 +491,19 @@ end; procedure KeyPress (K: Word); +{$IFNDEF HEADLESS} var Msg: g_gui.TMessage; +{$ENDIF} begin +{$IFNDEF HEADLESS} case K of - IK_PAUSE: // : - begin - if (g_ActiveWindow = nil) then g_Game_Pause(not gPause); - end; - - IK_BACKQUOTE: // <`/~/¨/¸>: + VK_ESCAPE: // : begin - g_Console_Switch(); - end; - - IK_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 @@ -561,6 +569,7 @@ begin end; end; end; +{$ENDIF} end; @@ -569,11 +578,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