X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_main.pas;h=9a7250f9fc28a21b9933dfaa61123c4587f70fe7;hb=ee093c74b7f323b8589dc39ca7c39e89bc6e7e63;hp=2758377eb4ad627d15e5f646705b5b740724bd1e;hpb=1bddfaf7b6421f1659a6f211dfdb1dfaef5d5173;p=d2df-sdl.git diff --git a/src/game/g_main.pas b/src/game/g_main.pas index 2758377..9a7250f 100644 --- a/src/game/g_main.pas +++ b/src/game/g_main.pas @@ -37,9 +37,14 @@ var implementation uses - SDL2, GL, GLExt, wadreader, e_log, g_window, +{$IFDEF USE_NANOGL} + nanoGL, +{$ELSE} + GL, GLExt, +{$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, @@ -66,6 +71,16 @@ begin e_InitLog(GameDir + '/' + LOG_FILENAME, TWriteMode.WM_NEWFILE); + 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 + ); + e_WriteLog('Read config file', TMsgType.Notify); g_Options_Read(GameDir + '/' + CONFIG_FILENAME); @@ -91,7 +106,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} @@ -374,9 +390,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;