X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_game.pas;h=497567b23ccf7e36e3e8e5f011c411211d65502c;hb=2f523bed7d04e657b2ce4e69eaf05aee6a81fb4c;hp=369f5ac58f4adb8068bed26d2afe20260d85981b;hpb=243b29c59bbb6ff7ddb1f5822dc3de1be593660a;p=d2df-sdl.git diff --git a/src/game/g_game.pas b/src/game/g_game.pas index 369f5ac..497567b 100644 --- a/src/game/g_game.pas +++ b/src/game/g_game.pas @@ -4241,19 +4241,7 @@ begin gPlayer2 := g_Player_Get(gLMSPID2); end; - for i := Low(gItems) to High(gItems) do - begin - if gItems[i].Respawnable then - begin - gItems[i].QuietRespawn := True; - gItems[i].RespawnTime := 0; - end - else - begin - g_Items_Remove(i); - if g_Game_IsNet then MH_SEND_ItemDestroy(True, i); - end; - end; + g_Items_RestartRound(); for i := Low(gMonsters) to High(gMonsters) do begin @@ -6869,8 +6857,8 @@ begin gDefaultMegawadStart := s; end; - s := LowerCase(Find_Param_Value(pars, '-dbg-mainwad-restore')); - if (s <> '') then + if (Find_Param_Value(pars, '--dbg-mainwad-restore') <> '') or + (Find_Param_Value(pars, '--dbg-mainwad-default') <> '') then begin gDefaultMegawadStart := DF_Default_Megawad_Start; end;