X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_triggers.pas;h=88e51347a9ef53678adcbdf23bd8e4f0c8b45f16;hb=95e5dc9815ded04c52a0e5fadb77580f1d6ed7c0;hp=2d19853372178e21d863f10c8f39d9d521ccca57;hpb=db4e988645273fe1c11611d84e03f0199cd181f7;p=d2df-sdl.git diff --git a/src/game/g_triggers.pas b/src/game/g_triggers.pas index 2d19853..88e5134 100644 --- a/src/game/g_triggers.pas +++ b/src/game/g_triggers.pas @@ -2470,7 +2470,7 @@ begin // Îïðåäåëÿåì èçìåíÿåìûå èì òðèããåðû: for b := 0 to High(gTriggers) do begin - if g_Collide(tgctX, tgctY, tgctWidth, tgctHeight, gTriggers[b].X, gTriggers[b].Y, + if g_Collide(tgcTX, tgcTY, tgcTWidth, tgcTHeight, gTriggers[b].X, gTriggers[b].Y, gTriggers[b].Width, gTriggers[b].Height) and ((b <> a) or (tgcWait > 0)) then begin // Can be self-activated, if there is Data.Wait