# HG changeset patch # User Wuzzy # Date 1566878703 -7200 # Node ID 114b036522a62a758275d291235b5abcc39d7f8a # Parent c5934cdeecb6e5b67148212b7302588509b24bac King Mode: Automatically select teleport in king placement phase diff -r c5934cdeecb6 -r 114b036522a6 ChangeLog.txt --- a/ChangeLog.txt Mon Aug 26 15:44:03 2019 -0600 +++ b/ChangeLog.txt Tue Aug 27 06:05:03 2019 +0200 @@ -50,6 +50,7 @@ + CTF_Blizzard: Various minor graphical and text improvements + Frenzy: Change ammo slots + Continental supplies: Show continent in team bars + + King Mode: Automatically select teleport in king placement phase * Balanced Random Weapon: Fix Lua errors after using Time Box * Racer: Fix racer ghost not getting reset after a skip * Space Invasion: No longer allow to set start shield above shield limit diff -r c5934cdeecb6 -r 114b036522a6 hedgewars/uAmmos.pas --- a/hedgewars/uAmmos.pas Mon Aug 26 15:44:03 2019 -0600 +++ b/hedgewars/uAmmos.pas Tue Aug 27 06:05:03 2019 +0200 @@ -202,7 +202,7 @@ if Hedgehogs[i].Gear <> nil then begin Hedgehogs[i].Ammo:= GetAmmoByNum(Hedgehogs[i].AmmoStore); - if (GameFlags and gfPlaceHog) <> 0 then + if ((GameFlags and gfPlaceHog) <> 0) or (((GameFlags and gfKing) <> 0) and (Hedgehogs[i].King = true)) then Hedgehogs[i].CurAmmoType:= amTeleport else Hedgehogs[i].CurAmmoType:= amNothing