Skip to content

Commit

Permalink
misc
Browse files Browse the repository at this point in the history
  • Loading branch information
jadebenn committed Dec 17, 2024
1 parent d42351d commit 79c26d9
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
10 changes: 9 additions & 1 deletion dGame/dComponents/PetComponent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,14 @@ void PetComponent::OnUse(Entity* originator) {
case ePetAbilityType::JumpOnObject: // Bouncer
StartInteractBouncer();
break;

default:
LOG_DEBUG(
"Unhandled pet interaction - Owner: %ld, ePetAbilityType %d",
m_Owner,
GeneralUtils::ToUnderlying(m_Interaction.ability)
);
break;
}
} else {
StartTamingMinigame(originator);
Expand Down Expand Up @@ -323,7 +331,7 @@ void PetComponent::StartTamingMinigame(Entity* originator) {
// Notify the start of a pet taming minigame
m_Parent->GetScript()->OnNotifyPetTamingMinigame(m_Parent, originator, ePetTamingNotifyType::BEGIN);

auto* characterComponent = originator->GetComponent<CharacterComponent>();
auto* const characterComponent = originator->GetComponent<CharacterComponent>();
if (characterComponent != nullptr) {
characterComponent->SetCurrentActivity(eGameActivity::PET_TAMING);
Game::entityManager->SerializeEntity(originator);
Expand Down
2 changes: 1 addition & 1 deletion dGame/dGameMessages/GameMessageHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream& inStream, const System
if (var) {
entity->SetVar<bool>(u"dlu_first_time_load", false);
InventoryComponent* inventoryComponent = entity->GetComponent<InventoryComponent>();

if (inventoryComponent) inventoryComponent->FixInvisibleItems();
}
break;
Expand Down

0 comments on commit 79c26d9

Please sign in to comment.