fixed typo in trigger caching; Anower Station is REALLY working now

diff --git a/src/game/g_triggers.pas b/src/game/g_triggers.pas
index 2d19853372178e21d863f10c8f39d9d521ccca57..88e51347a9ef53678adcbdf23bd8e4f0c8b45f16 100644 (file)
--- 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

diff --git a/src/shared/mapdef_tgc_impl.inc b/src/shared/mapdef_tgc_impl.inc
index cfd3ed22b222e92902c314c5d8a49f2582298b3b..c26709d3f02fb9cc3c171b35a8d218f2ebb1e622 100644 (file)
--- a/src/shared/mapdef_tgc_impl.inc
+++ b/src/shared/mapdef_tgc_impl.inc
@@ -33,7 +33,7 @@ begin
     TRIGGER_ONOFF:
       begin
         tgt.tgcTX := tdata.trigTX;
-        tgt.tgcTY := tdata.trigTX;
+        tgt.tgcTY := tdata.trigTY;
         tgt.tgcTWidth := tdata.trigTWidth;
         tgt.tgcTHeight := tdata.trigTHeight;
         tgt.tgcWait := tdata.trigWait;
@@ -62,7 +62,7 @@ begin
     TRIGGER_SPAWNMONSTER:
       begin
         tgt.tgcTX := tdata.trigTX;
-        tgt.tgcTY := tdata.trigTX;
+        tgt.tgcTY := tdata.trigTY;
         tgt.tgcSpawnMonsType := tdata.trigSpawnMonsType;
         tgt.tgcHealth := tdata.trigHealth;
         tgt.tgcDirection := tdata.trigDirection;
@@ -76,7 +76,7 @@ begin
     TRIGGER_SPAWNITEM:
       begin
         tgt.tgcTX := tdata.trigTX;
-        tgt.tgcTY := tdata.trigTX;
+        tgt.tgcTY := tdata.trigTY;
         tgt.tgcSpawnItemType := tdata.trigSpawnItemType;
         tgt.tgcGravity := tdata.trigGravity;
         tgt.tgcDmonly := tdata.trigDmonly;
@@ -126,7 +126,7 @@ begin
     TRIGGER_SHOT:
       begin
         tgt.tgcTX := tdata.trigTX;
-        tgt.tgcTY := tdata.trigTX;
+        tgt.tgcTY := tdata.trigTY;
         tgt.tgcShotType := tdata.trigShotType;
         tgt.tgcShotTarget := tdata.trigShotTarget;
         tgt.tgcQuiet := tdata.trigQuiet;

diff --git a/src/tools/mapgen.dpr b/src/tools/mapgen.dpr
index 8a23afa7e46f99fc915417b1821d949660e35ff6..1a4850593b81dcf21d215761a613be7e971bc713 100644 (file)
--- a/src/tools/mapgen.dpr
+++ b/src/tools/mapgen.dpr
@@ -183,12 +183,12 @@ begin
             if fld.hasTPrefix then
             begin
               write(fo, '        tgt.tgcTX := tdata.trigTX;'#10);
-              write(fo, '        tgt.tgcTY := tdata.trigTX;'#10);
+              write(fo, '        tgt.tgcTY := tdata.trigTY;'#10);
             end
             else if fld.separatePasFields then
             begin
               write(fo, '        tgt.tgcX := tdata.trigX;'#10);
-              write(fo, '        tgt.tgcY := tdata.trigX;'#10);
+              write(fo, '        tgt.tgcY := tdata.trigY;'#10);
             end
             else
             begin