Ref #198 fix crash with manual trigger coll. fix

szapp · Oct 12, 2019 · 08535d7 · 08535d7
1 parent c5917a6
commit 08535d7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/_work/data/Scripts/Content/GFA/_intern/collision.d b/_work/data/Scripts/Content/GFA/_intern/collision.d
@@ -603,7 +603,7 @@ func void GFA_ExtendCollisionCheckNpc() {
     // Skip checks for shooter and target
     MemoryProtectionOverride(oCAIArrow__CanThisCollideWith_skipCheck, 2);
     MEM_WriteByte(oCAIArrow__CanThisCollideWith_skipCheck,   /*EB*/ 235);             // jmp     0x6A14F0
-    MEM_WriteByte(oCAIArrow__CanThisCollideWith_skipCheck+1, /*5A*/  90);             //         0x6A14F0-0x6A1494-2
+    MEM_WriteByte(oCAIArrow__CanThisCollideWith_skipCheck+1, /*57*/  87);             //         0x6A14F0-0x6A1497-2
 
     // Re-add these checks later (after ignore list iteration and Daedalus hook)
     ASM_Open(42);

diff --git a/_work/data/Scripts/Content/GFA/_intern/offsets_G2.d b/_work/data/Scripts/Content/GFA/_intern/offsets_G2.d
@@ -103,7 +103,7 @@ const int oCAIArrowBase__ReportCollisionToAI_PFXon2  =  6949396; //0x6A0A14
 const int oCAIArrowBase__ReportCollisionToAI_collNpc =  6949734; //0x6A0B66
 const int oCAIArrow__ReportCollisionToAI_destroyPrj  =  0;                                 // Does not exist in Gothic 2
 const int oCAIArrow__ReportCollisionToAI_keepPlyStrp =  0;                                 // Does not exist in Gothic 2
-const int oCAIArrow__CanThisCollideWith_skipCheck    =  6952084; //0x6A1494
+const int oCAIArrow__CanThisCollideWith_skipCheck    =  6952087; //0x6A1497
 const int oCAIArrow__CanThisCollideWith_npcShooter   =  6952106; //0x6A14AA
 const int oCAIHuman__MagicMode_g2ctrlCheck           =  4665380; //0x473024
 const int oCAIHuman__BowMode_g2ctrlCheck             =  6905643; //0x695F2B