Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-07-07 04:00:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

formatting nits

Browse Source
This commit is contained in:
jadebenn 2024-12-14 20:24:53 -06:00
parent f7bcbb0506
commit d42351d1f3
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dScripts/02_server/Map/General/PetDigServer.cpp
View File

@ -71,7 +71,7 @@ void PetDigServer::OnDie(Entity* self, Entity* killer) {
treasures.erase(iterator); treasures.erase(iterator);
} }
auto* owner = killer->GetOwner(); auto* const owner = killer->GetOwner();
const auto digInfoIterator = digInfoMap.find(self->GetLOT()); const auto digInfoIterator = digInfoMap.find(self->GetLOT());
const auto digInfo = digInfoIterator != digInfoMap.end() ? digInfoIterator->second : defaultDigInfo; const auto digInfo = digInfoIterator != digInfoMap.end() ? digInfoIterator->second : defaultDigInfo;
@ -80,7 +80,7 @@ void PetDigServer::OnDie(Entity* self, Entity* killer) {
} else if (digInfo.builderOnly) { } else if (digInfo.builderOnly) {
// Some treasures may only be retrieved by the player that built the diggable // Some treasures may only be retrieved by the player that built the diggable
auto builder = self->GetVar<LWOOBJID>(u"builder"); // Set by the pet dig build script const auto builder = self->GetVar<LWOOBJID>(u"builder"); // Set by the pet dig build script
if (builder != owner->GetObjectID()) if (builder != owner->GetObjectID())
return; return;
} else if (digInfo.xBuild) { } else if (digInfo.xBuild) {
@ -96,7 +96,7 @@ void PetDigServer::OnDie(Entity* self, Entity* killer) {
// TODO: Reset other pets // TODO: Reset other pets
// Handles smashing leftovers (edge case for the AG X) // Handles smashing leftovers (edge case for the AG X)
auto* xObject = Game::entityManager->GetEntity(self->GetVar<LWOOBJID>(u"X")); auto* const xObject = Game::entityManager->GetEntity(self->GetVar<LWOOBJID>(u"X"));
if (xObject != nullptr) { if (xObject != nullptr) {
xObject->Smash(xObject->GetObjectID(), eKillType::VIOLENT); xObject->Smash(xObject->GetObjectID(), eKillType::VIOLENT);
} }
@ -105,7 +105,7 @@ void PetDigServer::OnDie(Entity* self, Entity* killer) {
void PetDigServer::OnUse(Entity* self, Entity* user) { void PetDigServer::OnUse(Entity* self, Entity* user) {
LOG_DEBUG("Treasure used! LWOOBJID: %d", self->GetObjectID()); LOG_DEBUG("Treasure used! LWOOBJID: %d", self->GetObjectID());
auto* petComponent = PetComponent::GetActivePet(user->GetObjectID()); auto* const petComponent = PetComponent::GetActivePet(user->GetObjectID());
if (!petComponent) return; if (!petComponent) return;
if (petComponent->IsReadyToInteract()) { if (petComponent->IsReadyToInteract()) {
@ -114,15 +114,15 @@ void PetDigServer::OnUse(Entity* self, Entity* user) {
} }
void PetDigServer::HandleXBuildDig(const Entity* self, Entity* owner, Entity* pet) { void PetDigServer::HandleXBuildDig(const Entity* self, Entity* owner, Entity* pet) {
auto playerID = self->GetVar<LWOOBJID>(u"builder"); const auto playerID = self->GetVar<LWOOBJID>(u"builder");
if (playerID == LWOOBJID_EMPTY || playerID != owner->GetObjectID()) if (playerID == LWOOBJID_EMPTY || playerID != owner->GetObjectID())
return; return;
auto* playerEntity = Game::entityManager->GetEntity(playerID); auto* const playerEntity = Game::entityManager->GetEntity(playerID);
if (!playerEntity || !playerEntity->GetCharacter()) if (!playerEntity || !playerEntity->GetCharacter())
return; return;
auto* player = playerEntity->GetCharacter(); auto* const player = playerEntity->GetCharacter();
const auto groupID = self->GetVar<std::u16string>(u"groupID"); const auto groupID = self->GetVar<std::u16string>(u"groupID");
int32_t playerFlag = 0; int32_t playerFlag = 0;
@ -137,7 +137,7 @@ void PetDigServer::HandleXBuildDig(const Entity* self, Entity* owner, Entity* pe
// If the player doesn't have the flag yet // If the player doesn't have the flag yet
if (playerFlag != 0 && !player->GetPlayerFlag(playerFlag)) { if (playerFlag != 0 && !player->GetPlayerFlag(playerFlag)) {
auto* petComponent = pet->GetComponent<PetComponent>(); auto* const petComponent = pet->GetComponent<PetComponent>();
if (petComponent != nullptr) { if (petComponent != nullptr) {
// TODO: Pet state = 9 ?? // TODO: Pet state = 9 ??
} }
@ -146,22 +146,22 @@ void PetDigServer::HandleXBuildDig(const Entity* self, Entity* owner, Entity* pe
player->SetPlayerFlag(playerFlag, true); player->SetPlayerFlag(playerFlag, true);
} }
auto* xObject = Game::entityManager->GetEntity(self->GetVar<LWOOBJID>(u"X")); auto* const xObject = Game::entityManager->GetEntity(self->GetVar<LWOOBJID>(u"X"));
if (xObject != nullptr) { if (xObject != nullptr) {
xObject->Smash(xObject->GetObjectID(), eKillType::VIOLENT); xObject->Smash(xObject->GetObjectID(), eKillType::VIOLENT);
} }
} }
void PetDigServer::HandleBouncerDig(const Entity* self, const Entity* owner) { void PetDigServer::HandleBouncerDig(const Entity* self, const Entity* owner) {
auto bounceNumber = GeneralUtils::UTF16ToWTF8(self->GetVar<std::u16string>(u"BouncerNumber")); const auto bounceNumber = GeneralUtils::UTF16ToWTF8(self->GetVar<std::u16string>(u"BouncerNumber"));
auto bouncerSpawners = Game::zoneManager->GetSpawnersByName("PetBouncer" + bounceNumber); const auto bouncerSpawners = Game::zoneManager->GetSpawnersByName("PetBouncer" + bounceNumber);
auto switchSpawners = Game::zoneManager->GetSpawnersByName("PetBouncerSwitch" + bounceNumber); const auto switchSpawners = Game::zoneManager->GetSpawnersByName("PetBouncerSwitch" + bounceNumber);
for (auto* bouncerSpawner : bouncerSpawners) { for (auto* const bouncerSpawner : bouncerSpawners) {
bouncerSpawner->Activate(); bouncerSpawner->Activate();
} }
for (auto* switchSpawner : switchSpawners) { for (auto* const switchSpawner : switchSpawners) {
switchSpawner->Activate(); switchSpawner->Activate();
} }
} }