X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_options.pas;h=ace71914663e7a139ae5f705149984909cec83cc;hb=3b7ef59c450d979b7011cdeaadd6d8e59c34f197;hp=29df099f1bef5ab1cde7572683a84918a2c69308;hpb=9daac605a3cc6dc27c60253022bf6afbcd22fc0d;p=d2df-sdl.git diff --git a/src/game/g_options.pas b/src/game/g_options.pas index 29df099..ace7191 100644 --- a/src/game/g_options.pas +++ b/src/game/g_options.pas @@ -68,7 +68,7 @@ var gsMap: String; gsGameMode: String; gsTimeLimit: Word; - gsGoalLimit: Word; + gsScoreLimit: Word; gsMaxLives: Byte; gsPlayers: Byte; gsGameFlags: LongWord; @@ -114,7 +114,7 @@ begin gScreenHeight := 480; gWinSizeX := 640; gWinSizeY := 480; - //gBPP := SDL_BITSPERPIXEL(dispaly.format); + //gBPP := SDL_BITSPERPIXEL(display.format); gBPP := 32; {$IFDEF ANDROID} gFullScreen := True; (* rotation not allowed? *) @@ -262,7 +262,7 @@ begin gsMap := ''; gsGameMode := _lc[I_MENU_GAME_TYPE_DM]; gsTimeLimit := 0; - gsGoalLimit := 0; + gsScoreLimit := 0; gsMaxLives := 0; gsPlayers := 1; gsSpawnInvul := 0; @@ -277,7 +277,7 @@ begin g_Options_ApplyGameSettings; (* section MasterServer *) - NetMasterList := 'mpms.doom2d.org:25665, deadsoftware.ru:25665, carrotterminal.deadsoftware.ru:25665'; + NetMasterList := 'mpms.doom2d.org:25665, deadsoftware.ru:25665, terminalcorner.ru:25665'; g_Net_Slist_Set(NetMasterList); (* section Server *) @@ -311,7 +311,7 @@ begin if GameMode = GM_SINGLE then GameMode := GM_COOP; TimeLimit := gsTimeLimit; - GoalLimit := gsGoalLimit; + ScoreLimit := gsScoreLimit; MaxLives := gsMaxLives; SpawnInvul := gsSpawnInvul; ItemRespawnTime := gsItemRespawnTime;