Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix resurrector handling turn time manually, use correct ammoprop instead
authorWuzzy <Wuzzy2@mail.ru>
Fri, 26 Oct 2018 23:09:50 +0200
changeset 13996 755f389a1e73
parent 13995 52e20f8f538a
child 13997 971693c921ed
Fix resurrector handling turn time manually, use correct ammoprop instead This also fixes this bug: The clock turned gray while using resurrector, although the time actually counts down.
hedgewars/uGearsHandlersMess.pas file | annotate | diff | comparison | revisions
hedgewars/uVariables.pas file | annotate | diff | comparison | revisions 
--- a/hedgewars/uGearsHandlersMess.pas	Fri Oct 26 22:52:17 2018 +0200
+++ b/hedgewars/uGearsHandlersMess.pas	Fri Oct 26 23:09:50 2018 +0200
@@ -5862,9 +5862,6 @@
     i: LongInt;
     s: ansistring;
 begin
-    if (TurnTimeLeft > 0) then
-        dec(TurnTimeLeft);
-
     AllInactive := false;
     hh := Gear^.Hedgehog;
 
--- a/hedgewars/uVariables.pas	Fri Oct 26 22:52:17 2018 +0200
+++ b/hedgewars/uVariables.pas	Fri Oct 26 23:09:50 2018 +0200
@@ -2172,7 +2172,8 @@
             NumberInCase: 1;
             Ammo: (Propz: ammoprop_NoCrosshair or
                           ammoprop_Utility or
-                          ammoprop_NoRoundEnd;
+                          ammoprop_NoRoundEnd or
+                          ammoprop_DoesntStopTimerWhileAttacking;
                 Count: 1;
                 NumPerTurn: 0;
                 Timer: 0;
hedgewars