@@ -567,14 +567,12 @@ namespace FetchBomb
567567DEFINE_HOOK (0x438771 , BombClass_Detonate_SetContext, 0x6 )
568568{
569569 GET (BombClass*, pThis, ESI);
570+ GET (CoordStruct*, pCoords, EDX);
570571
571572 FetchBomb::pThisBomb = pThis;
572573
573574 if (RulesExt::Global ()->IvanBombAttachToCenter )
574- {
575- CoordStruct coords = pThis->Target ->GetCenterCoords ();
576- R->EDX (&coords);
577- }
575+ *pCoords = pThis->Target ->GetCenterCoords ();
578576
579577 return 0 ;
580578}
@@ -624,12 +622,10 @@ DEFINE_FUNCTION_JUMP(CALL, 0x4387A3, _BombClass_Detonate_DamageArea);
624622DEFINE_HOOK (0x6F5201 , TechnoClass_DrawExtras_IvanBombImage, 0x6 )
625623{
626624 GET (TechnoClass*, pThis, EBP);
625+ GET (CoordStruct*, pCoords, EAX);
627626
628627 if (RulesExt::Global ()->IvanBombAttachToCenter )
629- {
630- auto coords = pThis->GetCenterCoords ();
631- R->EAX (&coords);
632- }
628+ *pCoords = pThis->GetCenterCoords ();
633629
634630 return 0 ;
635631}
@@ -653,12 +649,10 @@ DEFINE_HOOK(0x43D874, BuildingClass_Draw_BuildupBibShape, 0x6)
653649DEFINE_HOOK (0x70BCE6 , TechnoClass_GetTargetCoords_BuildingFix, 0x6 )
654650{
655651 GET (TechnoClass*, pThis, ESI);
652+ GET (CoordStruct*, pCoords, EAX);
656653
657654 if (const auto pBuilding = abstract_cast<BuildingClass*>(pThis->Target ))
658- {
659- const auto coords = pBuilding->GetTargetCoords ();
660- R->EAX (&coords);
661- }
655+ *pCoords = pBuilding->GetTargetCoords ();
662656
663657 return 0 ;
664658}
0 commit comments