Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-12-23 05:53:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Styling edits

Browse Source
This commit is contained in:
Aaron Kimbre 2022-05-04 18:24:28 -05:00
parent e81acb4c67
commit ad5c679d2d
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dGame/dComponents/RocketLaunchLupComponent.cpp
View File

@ -30,8 +30,8 @@ void RocketLaunchLupComponent::OnUse(Entity* originator) {
auto* characterComponent = originator->GetComponent<CharacterComponent>();
if (!inventoryComponent || !characterComponent) return;
Item* rocket = nullptr;
rocket = inventoryComponent->FindItemById(characterComponent->GetLastRocketItemID());
Item* rocket = inventoryComponent->FindItemById(characterComponent->GetLastRocketItemID());
if (!rocket) return;
rocket->Equip(true);

13
dGame/dComponents/RocketLaunchLupComponent.h
View File

@ -15,9 +15,22 @@ public:
RocketLaunchLupComponent(Entity* parent);
~RocketLaunchLupComponent() override;
/**
* Handles an OnUse event from some entity, preparing it for launch to some other world
* Builds m_LUPWorlds
* @param originator the entity that triggered the event
*/
void OnUse(Entity* originator) override;
/**
* Handles an OnUse event from some entity, preparing it for launch to some other world
*
* @param originator the entity that triggered the event
* @param index index of the world that was selected
* @param sysAddr the address to send gamemessage responses to
*/
void OnSelectWorld(Entity* originator, uint32_t index, const SystemAddress& sysAddr);
private:
// vector of the LUP World Zone IDs, built from CDServer's LUPZoneIDs table
std::vector<LWOMAPID> m_LUPWorlds {};
};

2
dGame/dGameMessages/GameMessages.cpp
View File

@ -2733,7 +2733,7 @@ void GameMessages::HandleEnterProperty(RakNet::BitStream* inStream, Entity* enti
}
auto rocketLaunchLupComponent = entity->GetComponent<RocketLaunchLupComponent>();
if (rocketLaunchLupComponent) {
if (rocketLaunchLupComponent != nullptr) {
rocketLaunchLupComponent->OnSelectWorld(player, index, sysAddr);
}
}