X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_main.pas;h=3b84f30eb820982eae315c8147e4eccdfdc9458a;hb=f9af3a48743f80e9095082f9d8156d60b62f6b29;hp=b5595832e9573dd1fd2242dbbf32af4085fce7ff;hpb=f4de88f1f4384cc3c798bccc695d92ad3781eb7b;p=d2df-sdl.git diff --git a/src/game/g_main.pas b/src/game/g_main.pas index b559583..3b84f30 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,6 +31,7 @@ var MapsDir: string; ModelsDir: string; GameWAD: string; + LogFileName: string; implementation @@ -44,7 +44,7 @@ uses e_graphics, e_input, g_game, g_console, g_gui, 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_touch, + g_menu, g_language, g_net, g_touch, g_res_downloader, utils, conbuf, envvars, xparser; @@ -67,7 +67,7 @@ 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( 'Doom 2D: Forever version ' + GAME_VERSION + @@ -161,6 +161,8 @@ 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} @@ -476,9 +478,12 @@ end; procedure KeyPress (K: Word); +{$IFNDEF HEADLESS} var Msg: g_gui.TMessage; +{$ENDIF} begin +{$IFNDEF HEADLESS} case K of VK_ESCAPE: // : begin @@ -551,6 +556,7 @@ begin end; end; end; +{$ENDIF} end;