X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fgame%2Fg_main.pas;h=5c458d5159025a8f4b376bb425802b8986f1a877;hp=3b84f30eb820982eae315c8147e4eccdfdc9458a;hb=59b0e5dfe65548c5fa24cc64136417c37b495573;hpb=f9af3a48743f80e9095082f9d8156d60b62f6b29 diff --git a/src/game/g_main.pas b/src/game/g_main.pas index 3b84f30..5c458d5 100644 --- a/src/game/g_main.pas +++ b/src/game/g_main.pas @@ -17,6 +17,8 @@ unit g_main; interface + uses Utils; + procedure Main (); procedure Init (); procedure Release (); @@ -26,93 +28,487 @@ procedure KeyPress (K: Word); procedure CharPress (C: AnsiChar); var - GameDir: string; - DataDir: string; - MapsDir: string; - ModelsDir: string; + {--- Read-only dirs ---} GameWAD: string; + DataDirs: SSArray; + ModelDirs: SSArray; + MegawadDirs: SSArray; + MapDirs: SSArray; + WadDirs: SSArray; + AllMapDirs: SSArray; // Maps + Megawads + + {--- Read-Write dirs ---} LogFileName: string; + LogDirs: SSArray; + SaveDirs: SSArray; + CacheDirs: SSArray; + ConfigDirs: SSArray; + ScreenshotDirs: SSArray; + StatsDirs: SSArray; + MapDownloadDirs: SSArray; + WadDownloadDirs: SSArray; + + GameWADName: string = 'GAME'; implementation uses {$INCLUDE ../nogl/noGLuses.inc} {$IFDEF ENABLE_HOLMES} - g_holmes, fui_wadread, fui_style, fui_gfx_gl, + g_holmes, sdlcarcass, fui_ctls, fui_wadread, fui_style, fui_gfx_gl, +{$ENDIF} +{$IFDEF LINUX} + BaseUnix, {$ENDIF} - SDL2, wadreader, e_log, g_window, +{$IFDEF DARWIN} + MacOSAll, CocoaAll, +{$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, g_basic, - g_weapons, SysUtils, g_triggers, MAPDEF, g_map, - g_menu, g_language, g_net, g_touch, g_res_downloader, - utils, conbuf, envvars, + g_weapons, SysUtils, g_triggers, MAPDEF, g_map, e_res, + g_menu, g_language, g_net, g_touch, g_system, g_res_downloader, + conbuf, envvars, xparser; var charbuff: packed array [0..15] of AnsiChar; + binPath: AnsiString = ''; + forceBinDir: Boolean; + {$IFDEF USE_SDLMIXER} + UseNativeMusic: Boolean; + {$ENDIF} -procedure Main(); +function GetBinaryPath (): AnsiString; +{$IFDEF LINUX} var - sdlflags: LongWord; -{$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)} - flexloaded: Boolean; + //cd: AnsiString; + sl: AnsiString; {$ENDIF} begin - e_InitWritelnDriver(); - - GetDir(0, GameDir); - MapsDir := GameDir + '/maps/'; - DataDir := GameDir + '/data/'; - ModelsDir := DataDir + 'models/'; - GameWAD := DataDir + 'Game.wad'; + result := ExtractFilePath(ParamStr(0)); + {$IFDEF LINUX} + // it may be a symlink; do some guesswork here + sl := fpReadLink(ExtractFileName(ParamStr(0))); + if (sl = ParamStr(0)) then + begin + // use current directory, as we don't have anything better + //result := '.'; + GetDir(0, result); + end; + {$ENDIF} + result := fixSlashes(result); + if (length(result) > 0) and (result[length(result)] <> '/') then result := result+'/'; +end; - e_InitLog(GameDir + '/' + LogFileName, TWriteMode.WM_NEWFILE); +procedure PrintDirs (msg: AnsiString; dirs: SSArray); + var dir: AnsiString; +begin + e_LogWriteln(msg + ':'); + for dir in dirs do + e_LogWriteln(' ' + dir); +end; - 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 DARWIN} + function NSStringToAnsiString (s: NSString): AnsiString; + var i: Integer; + begin + result := ''; + for i := 0 to s.length - 1 do + result := result + AnsiChar(s.characterAtIndex(i)); + end; -{$IFDEF HEADLESS} - conbufDumpToStdOut := true; + function GetBundlePath (): AnsiString; + var pathRef: CFURLRef; pathCFStr: CFStringRef; pathStr: ShortString; + begin + pathRef := CFBundleCopyBundleURL(CFBundleGetMainBundle()); + pathCFStr := CFURLCopyFileSystemPath(pathRef, kCFURLPOSIXPathStyle); + CFStringGetPascalString(pathCFStr, @pathStr, 255, CFStringGetSystemEncoding()); + CFRelease(pathRef); + CFRelease(pathCFStr); + Result := pathStr; + end; {$ENDIF} - e_WriteToStdOut := False; //{$IFDEF HEADLESS}True;{$ELSE}False;{$ENDIF} -{$IFDEF HEADLESS} - {$IFDEF USE_SDLMIXER} - sdlflags := SDL_INIT_TIMER or SDL_INIT_AUDIO or $00004000; - // HACK: shit this into env and hope for the best - SetEnvVar('SDL_AUDIODRIVER', 'dummy'); - {$ELSE} - sdlflags := SDL_INIT_TIMER or $00004000; - {$ENDIF} -{$ELSE} - {$IFDEF USE_SDLMIXER} - {*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} +procedure InitPath; + var i: Integer; rwdir, rodir: AnsiString; rwdirs, rodirs: SSArray; + + procedure AddDir (var dirs: SSArray; append: AnsiString); + begin + SetLength(dirs, Length(dirs) + 1); + dirs[High(dirs)] := ExpandFileName(append) + end; + + function IsSep (ch: Char): Boolean; + begin + {$IFDEF WINDOWS} + result := (ch = '/') or (ch = '\'); + {$ELSE} + result := (ch = '/'); + {$ENDIF} + end; + + function OptimizePath (dir: AnsiString): AnsiString; + var i, len: Integer; s: AnsiString; + begin + i := 1; len := Length(dir); s := ''; + while i <= len do + begin + if IsSep(dir[i]) then + begin + s := s + DirectorySeparator; + Inc(i); + while (i <= len) and IsSep(dir[i]) do Inc(i); + if (i <= len) and (dir[i] = '.') then + begin + if (i = len) or IsSep(dir[i + 1]) then + begin + Inc(i) + end + else if (i + 1 <= len) and (dir[i + 1] = '.') then + begin + if (i + 1 = len) or IsSep(dir[i + 2]) then + begin + s := e_UpperDir(s); + Inc(i, 2) + end + end + end + end + else + begin + s := s + dir[i]; + Inc(i) + end + end; + result := s + end; + + procedure OptimizeDirs (var dirs: SSArray); + var i, j, k: Integer; + begin + for i := 0 to High(dirs) do + dirs[i] := OptimizePath(dirs[i]); + // deduplicate + i := High(dirs); + while i >= 0 do + begin + j := 0; + while j < i do + begin + if dirs[j] = dirs[i] then + begin + for k := j + 1 to High(dirs) do + dirs[k - 1] := dirs[k]; + Dec(i); + SetLength(dirs, High(dirs)) + end + else + begin + Inc(j) + end + end; + Dec(i) + end + end; + + procedure AddDef (var dirs: SSArray; base: SSArray; append: AnsiString); + var s: AnsiString; + begin + if Length(dirs) = 0 then + for s in base do + AddDir(dirs, e_CatPath(s, append)); + OptimizeDirs(dirs) + end; + + function GetDefaultRODirs (): SSArray; + {$IF DEFINED(UNIX) AND NOT DEFINED(DARWIN) AND NOT DEFINED(ANDROID)} + var home: AnsiString; + {$ENDIF} + {$IFDEF WINDOWS} + var appdata: AnsiString; + {$ENDIF} + {$IFDEF DARWIN} + var bundle, s: AnsiString; dirArr: NSArray; i: Integer; + {$ENDIF} + begin + result := nil; + {$IFDEF DARWIN} + bundle := GetBundlePath(); + if ExtractFileExt(bundle) <> '.app' then + AddDir(result, binpath); + {$ELSE} + AddDir(result, binPath); + {$ENDIF} + if forceBinDir = false then + begin + {$IFDEF USE_SDL2} + AddDir(result, SDL_GetBasePath()); + AddDir(result, SDL_GetPrefPath('', 'doom2df')); + {$ENDIF} + {$IFDEF WINDOWS} + appdata := GetEnvironmentVariable('APPDATA') + '\doom2df'; + if appdata <> '' then + AddDir(result, appdata); + {$ENDIF} + {$IF DEFINED(UNIX) AND NOT DEFINED(DARWIN) AND NOT DEFINED(ANDROID)} + AddDir(result, '/usr/share/doom2df'); + AddDir(result, '/usr/local/share/doom2df'); + home := GetEnvironmentVariable('HOME'); + if home <> '' then + AddDir(result, e_CatPath(home, '.doom2df')); + {$ENDIF} + {$IFDEF DARWIN} + bundle := GetBundlePath(); + if bundle <> '' then + AddDir(result, e_CatPath(bundle, 'Contents/Resources')); + dirArr := NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, true); + for i := 0 to dirArr.count - 1 do + begin + s := NSStringToAnsiString(dirArr.objectAtIndex(i)); + AddDir(result, e_CatPath(s, 'Doom 2D Forever')) + end; + {$ENDIF} + {$IF DEFINED(ANDROID) AND DEFINED(USE_SDL2)} + AddDir(result, SDL_AndroidGetInternalStoragePath()); + if SDL_AndroidGetExternalStorageState() <> 0 then + AddDir(result, SDL_AndroidGetExternalStoragePath()); + {$ENDIF} + end + end; + + function GetDefaultRWDirs (): SSArray; + {$IF DEFINED(UNIX) AND NOT DEFINED(DARWIN) AND NOT DEFINED(ANDROID)} + var home: AnsiString; + {$ENDIF} + {$IFDEF WINDOWS} + var appdata: AnsiString; + {$ENDIF} + {$IFDEF DARWIN} + var bundle, s: AnsiString; dirArr: NSArray; i: Integer; + {$ENDIF} + begin + result := nil; + {$IFDEF DARWIN} + bundle := GetBundlePath(); + if ExtractFileExt(bundle) <> '.app' then + AddDir(result, binPath); + {$ELSE} + AddDir(result, binPath); + {$ENDIF} + if forceBinDir = false then + begin + {$IFDEF USE_SDL2} + AddDir(result, SDL_GetPrefPath('', 'doom2df')); + {$ENDIF} + {$IFDEF WINDOWS} + appdata := GetEnvironmentVariable('APPDATA') + '\doom2df'; + if appdata <> '' then + AddDir(result, appdata); + {$ENDIF} + {$IF DEFINED(UNIX) AND NOT DEFINED(DARWIN) AND NOT DEFINED(ANDROID)} + home := GetEnvironmentVariable('HOME'); + if home <> '' then + AddDir(result, e_CatPath(home, '.doom2df')); + {$ENDIF} + {$IFDEF DARWIN} + dirArr := NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, true); + for i := 0 to dirArr.count - 1 do + begin + s := NSStringToAnsiString(dirArr.objectAtIndex(i)); + AddDir(result, e_CatPath(s, 'Doom 2D Forever')) + end; + {$ENDIF} + {$IF DEFINED(ANDROID) AND DEFINED(USE_SDL2)} + if SDL_AndroidGetExternalStorageState() <> 0 then + AddDir(result, SDL_AndroidGetExternalStoragePath()); + {$ENDIF} + end + end; + +begin + forceBinDir := false; + binPath := GetBinaryPath(); + + i := 1; + while i < ParamCount do + begin + case ParamStr(i) of + '--like-windoze': forceBinDir := true; + '--rw-dir': + begin + Inc(i); + rwdir := ParamStr(i); + (* RW *) + AddDir(LogDirs, e_CatPath(rwdir, '')); + AddDir(SaveDirs, e_CatPath(rwdir, 'data')); + AddDir(CacheDirs, e_CatPath(rwdir, 'data/cache')); + AddDir(ConfigDirs, e_CatPath(rwdir, '')); + AddDir(MapDownloadDirs, e_CatPath(rwdir, 'maps/downloads')); + AddDir(WadDownloadDirs, e_CatPath(rwdir, 'wads/downloads')); + AddDir(ScreenshotDirs, e_CatPath(rwdir, 'screenshots')); + AddDir(StatsDirs, e_CatPath(rwdir, 'stats')); + (* RO *) + AddDir(DataDirs, e_CatPath(rwdir, 'data')); + AddDir(ModelDirs, e_CatPath(rwdir, 'data/models')); + AddDir(MegawadDirs, e_CatPath(rwdir, 'maps/megawads')); + AddDir(MapDirs, e_CatPath(rwdir, 'maps')); + AddDir(WadDirs, e_CatPath(rwdir, 'wads')); + end; + '--ro-dir': + begin + Inc(i); + rodir := ParamStr(i); + (* RO *) + AddDir(DataDirs, e_CatPath(rodir, 'data')); + AddDir(ModelDirs, e_CatPath(rodir, 'data/models')); + AddDir(MegawadDirs, e_CatPath(rodir, 'maps/megawads')); + AddDir(MapDirs, e_CatPath(rodir, 'maps')); + AddDir(WadDirs, e_CatPath(rodir, 'wads')); + end; + '--game-wad': + begin + Inc(i); + GameWADName := ParamStr(i); + end; + '--config': + begin + Inc(i); + gConfigScript := ParamStr(i); + end; + end; + Inc(i) + end; + + // prefer bin dir if it writable and contains game.wad + if forceBinDir = false then + begin + if findDiskWad(binPath + 'data' + '/' + GameWADName) <> '' then + if e_CanCreateFilesAt(binPath) then + forceBinDir := true + end; + + (* RO *) + rodirs := GetDefaultRODirs(); + AddDef(DataDirs, rodirs, 'data'); + AddDef(ModelDirs, rodirs, 'data/models'); + AddDef(MegawadDirs, rodirs, 'maps/megawads'); + AddDef(MapDirs, rodirs, 'maps'); + AddDef(WadDirs, rodirs, 'wads'); + + (* RW *) + rwdirs := GetDefaultRWDirs(); + AddDef(LogDirs, rwdirs, ''); + AddDef(SaveDirs, rwdirs, 'data'); + AddDef(CacheDirs, rwdirs, 'data/cache'); + AddDef(ConfigDirs, rwdirs, ''); + AddDef(MapDownloadDirs, rwdirs, 'maps/downloads'); + AddDef(WadDownloadDirs, rwdirs, 'wads/downloads'); + AddDef(ScreenshotDirs, rwdirs, 'screenshots'); + AddDef(StatsDirs, rwdirs, 'stats'); + + for i := 0 to High(MapDirs) do + AddDir(AllMapDirs, MapDirs[i]); + for i := 0 to High(MegawadDirs) do + AddDir(AllMapDirs, MegawadDirs[i]); + OptimizeDirs(AllMapDirs); + + if LogFileName = '' then + begin + rwdir := e_GetWriteableDir(LogDirs, false); + if rwdir <> '' then + begin + {$IFDEF HEADLESS} + LogFileName := e_CatPath(rwdir, 'Doom2DF_H.log'); + {$ELSE} + LogFileName := e_CatPath(rwdir, 'Doom2DF.log'); + {$ENDIF} + end + end; + + // HACK: ensure the screenshots folder also has a stats subfolder in it + rwdir := e_GetWriteableDir(ScreenshotDirs, false); + if rwdir <> '' then CreateDir(rwdir + '/stats'); +end; + +procedure InitPrep; + var i: Integer; +begin + {$IFDEF HEADLESS} + conbufDumpToStdOut := true; + {$ENDIF} + for i := 1 to ParamCount do + begin + case ParamStr(i) of + '--con-stdout': conbufDumpToStdOut := true; + '--no-fbo': glRenderToFBO := false; + end + end; + + if LogFileName <> '' then + e_InitLog(LogFileName, TWriteMode.WM_NEWFILE); + e_InitWritelnDriver(); + 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('Build hash: ' + g_GetBuildHash(), TMsgType.Notify); + e_WriteLog('Build by: ' + g_GetBuilderName(), TMsgType.Notify); + + e_LogWritefln('Force bin dir: %s', [forceBinDir], TMsgType.Notify); + e_LogWritefln('BINARY PATH: [%s]', [binPath], TMsgType.Notify); - SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, '0'); + PrintDirs('DataDirs', DataDirs); + PrintDirs('ModelDirs', ModelDirs); + PrintDirs('MegawadDirs', MegawadDirs); + PrintDirs('MapDirs', MapDirs); + PrintDirs('WadDirs', WadDirs); - if SDL_Init(sdlflags) < 0 then - raise Exception.Create('SDL: Init failed: ' + SDL_GetError()); + PrintDirs('LogDirs', LogDirs); + PrintDirs('SaveDirs', SaveDirs); + PrintDirs('CacheDirs', CacheDirs); + PrintDirs('ConfigDirs', ConfigDirs); + PrintDirs('ScreenshotDirs', ScreenshotDirs); + PrintDirs('StatsDirs', StatsDirs); + PrintDirs('MapDownloadDirs', MapDownloadDirs); + PrintDirs('WadDownloadDirs', WadDownloadDirs); + + GameWAD := e_FindWad(DataDirs, GameWADName); + if GameWad = '' then + begin + e_WriteLog('WAD ' + GameWADName + ' not found in data directories.', TMsgType.Fatal); + {$IF DEFINED(USE_SDL2) AND NOT DEFINED(HEADLESS)} + if forceBinDir = false then + SDL_ShowSimpleMessageBox( + SDL_MESSAGEBOX_ERROR, + 'Doom 2D Forever', + PChar('WAD ' + GameWADName + ' not found in data directories.'), + nil + ); + {$ENDIF} + e_DeinitLog; + Halt(1); + end; +end; - e_WriteLog('Read config file', TMsgType.Notify); - g_Options_Read(GameDir + '/' + CONFIG_FILENAME); +procedure Main(); +{$IFDEF ENABLE_HOLMES} + var flexloaded: Boolean; +{$ENDIF} +begin + InitPath; + InitPrep; + e_InitInput; + sys_Init; - //GetSystemDefaultLCID() + g_Options_SetDefault; + g_Options_SetDefaultVideo; + g_Console_SysInit; + if sys_SetDisplayMode(gRC_Width, gRC_Height, gBPP, gRC_FullScreen, gRC_Maximized) = False then + raise Exception.Create('Failed to set videomode on startup.'); - //e_WriteLog('Read language file', MSG_NOTIFY); - //g_Language_Load(DataDir + gLanguage + '.txt'); e_WriteLog(gLanguage, TMsgType.Notify); g_Language_Set(gLanguage); @@ -159,23 +555,38 @@ begin end; end; g_holmes_imfunctional := not flexloaded; + + if (not g_holmes_imfunctional) then + begin + uiInitialize(); + uiContext.font := 'win14'; + end; + + if assigned(oglInitCB) then oglInitCB; {$ENDIF} - //g_Res_CreateDatabases(); // it will be done before connecting to the server for the first time + //g_Res_CreateDatabases(true); // it will be done before connecting to the server for the first time e_WriteLog('Entering SDLMain', TMsgType.Notify); -{$WARNINGS OFF} - SDLMain(); -{$WARNINGS ON} + {$WARNINGS OFF} + SDLMain(); + {$WARNINGS ON} - e_WriteLog('Releasing SDL', TMsgType.Notify); - SDL_Quit(); + {$IFDEF ENABLE_HOLMES} + if assigned(oglDeinitCB) then oglDeinitCB; + {$ENDIF} + + g_Console_WriteGameConfig; + sys_Final; end; procedure Init(); -var - NoSound: Boolean; + {$IFDEF USE_SDLMIXER} + var timiditycfg: AnsiString; + var oldcwd, newcwd: RawByteString; + {$ENDIF} + var NoSound: Boolean; begin Randomize; @@ -189,8 +600,6 @@ begin NoSound := False; {$ENDIF} - e_WriteLog('Init Input', TMsgType.Notify); - e_InitInput(); g_Touch_Init; (* @@ -200,10 +609,43 @@ begin e_WriteLog('Input: No Joysticks.', TMsgType.Notify); *) - if (not gNoSound) then + if gNoSound = false then begin e_WriteLog('Initializing sound system', TMsgType.Notify); + {$IFDEF USE_SDLMIXER} + newcwd := ''; + if UseNativeMusic then + SetEnvVar('SDL_NATIVE_MUSIC', '1'); + timiditycfg := GetEnvironmentVariable('TIMIDITY_CFG'); + if timiditycfg = '' then + begin + timiditycfg := 'timidity.cfg'; + if e_FindResource(ConfigDirs, timiditycfg) OR e_FindResource(DataDirs, timiditycfg) then + begin + timiditycfg := ExpandFileName(timiditycfg); + newcwd := ExtractFileDir(timiditycfg); + SetEnvVar('TIMIDITY_CFG', timiditycfg); + end + else + timiditycfg := ''; + end; + e_LogWritefln('TIMIDITY_CFG = "%s"', [timiditycfg]); + e_LogWritefln('SDL_NATIVE_MUSIC = "%s"', [GetEnvironmentVariable('SDL_NATIVE_MUSIC')]); + {$ENDIF} e_InitSoundSystem(NoSound); + {$IFDEF USE_SDLMIXER} + if e_TimidityDecoder and (newcwd <> '') then + begin + (* HACK: Set CWD to load GUS patches relatively to cfg file. *) + (* CWD not restored after sound init because timidity *) + (* store relative pathes internally and load patches *) + (* later. I hope game never relies on CWD. *) + oldcwd := ''; + GetDir(0, oldcwd); + ChDir(newcwd); + e_logwritefln('WARNING: USED TIMIDITY CONFIG HACK, CWD SWITCHED "%s" -> "%s"', [oldcwd, newcwd]); + end; + {$ENDIF} end; e_WriteLog('Init game', TMsgType.Notify); @@ -218,12 +660,12 @@ begin e_WriteLog('Releasing engine', TMsgType.Notify); e_ReleaseEngine(); - e_WriteLog('Releasing Input', TMsgType.Notify); + e_WriteLog('Releasing input', TMsgType.Notify); e_ReleaseInput(); if not gNoSound then begin - e_WriteLog('Releasing FMOD', TMsgType.Notify); + e_WriteLog('Releasing sound', TMsgType.Notify); e_ReleaseSoundSystem(); end; end; @@ -231,7 +673,16 @@ end; procedure Update (); begin + // remember old mobj positions, prepare for update + g_Game_PreUpdate(); + // server: receive client commands for new frame + // client: receive game state changes from server + if (NetMode = NET_SERVER) then g_Net_Host_Update() + else if (NetMode = NET_CLIENT) then g_Net_Client_Update(); + // think g_Game_Update(); + // server: send any accumulated outgoing data to clients + if NetMode = NET_SERVER then g_Net_Flush(); end; @@ -386,9 +837,9 @@ begin s2 := Copy(charbuff, 15, 2); if CheckCheat(I_GAME_CHEAT_CHANGEMAP, 2) and (s2[1] >= '0') and (s2[1] <= '9') and (s2[2] >= '0') and (s2[2] <= '9') then begin - if g_Map_Exist(MapsDir+gGameSettings.WAD+':\MAP'+s2) then + if g_Map_Exist(gGameSettings.WAD + ':\MAP' + s2) then begin - c := 'MAP'+s2; + c := 'MAP' + s2; g_Game_ExitLevel(c); end; goto Cheated; @@ -583,5 +1034,13 @@ begin end; end; - +initialization +{$IFDEF USE_SDLMIXER} + conRegVar('sdl_native_music', @UseNativeMusic, 'use native midi music output when possible', 'use native midi'); + {$IFDEF DARWIN} + UseNativeMusic := true; (* OSX have a good midi support, so why not? *) + {$ELSE} + UseNativeMusic := false; + {$ENDIF} +{$ENDIF} end.