X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_main.pas;h=ac2495448ed9caf0cefec0dd91ceb0c7b010ea63;hb=0cf1438ff1766dc311fbebc45f6171d64f757cd4;hp=b5a22840fbda68d7b604cb420dd1e351f07f0fb2;hpb=dcddacd6f339e310c23663bd7e0b6ec7733ccf0f;p=d2df-sdl.git diff --git a/src/game/g_main.pas b/src/game/g_main.pas index b5a2284..ac24954 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 @@ -91,7 +91,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 +375,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;