Merge branch 'reverse/CPedGroup' of https://github.com/Pirulax/gta-re…

…versed-modern into reverse/CPedGroup
gta-reversed · Jul 12, 2023 · 1f1b964 · 1f1b964
2 parents 353cd15 + 7f36516
commit 1f1b964
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/source/game_sa/PedGroup.cpp b/source/game_sa/PedGroup.cpp
@@ -23,7 +23,7 @@ float CPedGroup::FindDistanceToNearestMember(CPed** ppOutNearestMember) {
         }
         return std::sqrt(distSq);
     }
-    return 1.0e10;
+    return 1.0e10f;
 }
 
 // 0x5FACD0

diff --git a/source/game_sa/PedGroupMembership.cpp b/source/game_sa/PedGroupMembership.cpp
@@ -45,7 +45,7 @@ void CPedGroupMembership::AddMember(CPed* member, int32 memIdx) {
     CEntity::RegisterReference(m_members[memIdx]);
     /* dead code before checking if the member is in the player's group */
     if (!member->IsPlayer()) {
-        member->GetIntelligence()->SetPedDecisionMakerType(0);
+        member->GetIntelligence()->SetPedDecisionMakerType(DM_EVENT_DRAGGED_OUT_CAR);
     }
 }
 

diff --git a/source/game_sa/PedGroupMembership.h b/source/game_sa/PedGroupMembership.h
@@ -127,7 +127,6 @@ class CPedGroupMembership {
             if (!std::invoke(pred, mem)) {
                 continue;
             }
-
             if (const auto distSq = (pedPos - mem.GetPosition()).SquaredMagnitude(); closestDistSq > distSq) {
                 closestDistSq = distSq;
                 closest       = &mem;