Skip to content

Update CChar.cpp to allow modifying statf_pet and only update follower count if OF_Petslots active (avoid console error) #1463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Soulless-1 wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

Update CChar.cpp to allow modifying statf_pet and only update follower count if OF_Petslots active (avoid console error) #1463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
361a5c7
Update CChar.cpp
Soulless-1 Sep 18, 2025
3dd537a
Only update follower count if EF_FollowerList is toggled on.
Soulless-1 Sep 19, 2025
ca33df8
Changed from EF_FollowerList to OF_PetSlots
Soulless-1 Sep 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/game/chars/CChar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3867,8 +3867,8 @@ bool CChar::r_LoadVal( CScript & s )
_uiStatFlag = s.GetArgLLVal() & ~ (uint64)STATF_SAVEPARITY;
break;
}
// Don't modify STATF_SAVEPARITY, STATF_PET, STATF_SPAWNED here
static constexpr auto uiFlagsNoChange = (STATF_SAVEPARITY | STATF_PET | STATF_SPAWNED);
// Don't modify STATF_SAVEPARITY, STATF_SPAWNED here. Allow STATF_PET though.
static constexpr auto uiFlagsNoChange = (STATF_SAVEPARITY | STATF_SPAWNED);
static constexpr auto uiFlagsRequireFullUpdate = (STATF_STONE | STATF_HIDDEN | STATF_DEAD);
const auto uiCurFlags = _uiStatFlag;
const auto uiNewFlags = s.GetArgULLVal();
Expand Down
5 changes: 4 additions & 1 deletion src/game/chars/CCharSpell.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,10 @@ CChar * CChar::Spell_Summon_Place( CChar * pChar, CPointMap ptTarg, int64 iDurat
}
pChar->StatFlag_Set(STATF_CONJURED); // conjured creates have no loot
pChar->NPC_LoadScript(false);
ASSERT(FollowersUpdate(pChar, pChar->GetFollowerSlots(), true));
if (IsSetOF(OF_PetSlots))
{
ASSERT(FollowersUpdate(pChar, pChar->GetFollowerSlots(), true));
}
pChar->NPC_PetSetOwner(this);
pChar->MoveToChar(ptTarg);
pChar->m_ptHome = ptTarg;
Expand Down
Loading