Skip to content

Commit

Permalink
fix da build
Browse files Browse the repository at this point in the history
  • Loading branch information
Pirulax committed Jul 12, 2023
1 parent 1f1b964 commit 0c78ef2
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
1 change: 1 addition & 0 deletions libs/spdlog
Submodule spdlog added at 706ad7
5 changes: 0 additions & 5 deletions source/game_sa/PedGroupMembership.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,6 @@ void CPedGroupMembership::RemoveAllFollowers(bool bCreatedByMissionOnly) {
}
}

// 0x5FB210
void CPedGroupMembership::RemoveMember(CPed& ped) {
plugin::CallMethod<0x5FB210>(this, &ped);
}

// 0x5FB1D0
void CPedGroupMembership::RemoveNFollowers(size_t count) {
if (count == 0) { // Nothing to do
Expand Down
4 changes: 2 additions & 2 deletions source/game_sa/Scripts/Commands/Character.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,7 @@ auto RemoveCharElegantly(CRunningScript& S, CPed* ped) {
ped->SetCharCreatedBy(PED_GAME);
if (const auto grp = ped->GetGroup()) {
if (grp->GetMembership().IsFollower(ped)) { // TODO: Most likely inlined, this check makes no sense otherwise
grp->GetMembership().RemoveMember(*ped);
grp->GetMembership().RemoveMember(ped);
}
}
CPopulation::ms_nTotalMissionPeds--;
Expand Down Expand Up @@ -1344,7 +1344,7 @@ bool IsCharInSearchlight(uint32 searchLightIdx, CPed& ped) {
// REMOVE_CHAR_FROM_GROUP
void RemoveCharFromGroup(CPed& ped) {
if (auto pedGroup = ped.GetGroup(); pedGroup && !pedGroup->GetMembership().IsLeader(&ped)) {
pedGroup->GetMembership().RemoveMember(ped);
pedGroup->GetMembership().RemoveMember(&ped);
pedGroup->Process();
}
}
Expand Down

0 comments on commit 0c78ef2

Please sign in to comment.