Triggers: Random doesn't press disabled triggers

Doom2D · Dec 28, 2015 · 53ec1b5 · 53ec1b5
1 parent 0f8d387
commit 53ec1b5
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/DF Sources/g_triggers.pas b/DF Sources/g_triggers.pas
@@ -1450,16 +1450,23 @@ procedure g_Triggers_Update();
                gTriggers[b].Width, gTriggers[b].Height) and
                ((b <> a) or (Data.Wait > 0)) then
             begin // Can be self-activated, if there is Data.Wait
-              SetLength(Affected, Length(Affected) + 1);
-              Affected[High(Affected)] := b;
+              if (not Data.ExtRandom) or gTriggers[b].Enabled then
+              begin
+                SetLength(Affected, Length(Affected) + 1);
+                Affected[High(Affected)] := b;
+              end;
             end;
         // Âûáèðàåì îäèí èç òðèããåðîâ äëÿ ðàñøèðèòåëÿ, åñëè âêëþ÷åí ðàíäîì:
           if (TriggerType = TRIGGER_PRESS) and Data.ExtRandom then
           begin
-            b := Affected[Random(Length(Affected))];
-            gTriggers[b].ActivateUID := gTriggers[a].ActivateUID;
-            ActivateTrigger(gTriggers[b], 0);
-          end else // Â ïðîòèâíîì ñëó÷àå ðàáîòàåì êàê îáû÷íî:
+            if (Length(Affected) > 0) then
+            begin
+              b := Affected[Random(Length(Affected))];
+              gTriggers[b].ActivateUID := gTriggers[a].ActivateUID;
+              ActivateTrigger(gTriggers[b], 0);
+            end;
+          end
+          else // Â ïðîòèâíîì ñëó÷àå ðàáîòàåì êàê îáû÷íî:
             for i := 0 to High(Affected) do
             begin
               b := Affected[i];