Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-24 06:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into racing-update

Browse Source
This commit is contained in:
Aaron Kimbre 2023-05-09 22:45:48 -05:00
commit 0f200e6609
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dCommon/dEnums/eGameMessageType.h
View File

@ -273,7 +273,7 @@ enum class eGameMessageType : uint16_t {
TEAM_SET_LEADER = 1557, TEAM_SET_LEADER = 1557,
TEAM_INVITE_CONFIRM = 1558, TEAM_INVITE_CONFIRM = 1558,
TEAM_GET_STATUS_RESPONSE = 1559, TEAM_GET_STATUS_RESPONSE = 1559,
TEAM_ADD_PLAYER = 1526, TEAM_ADD_PLAYER = 1562,
TEAM_REMOVE_PLAYER = 1563, TEAM_REMOVE_PLAYER = 1563,
START_CELEBRATION_EFFECT = 1618, START_CELEBRATION_EFFECT = 1618,
ADD_BUFF = 1647, ADD_BUFF = 1647,

5
dGame/dComponents/RacingControlComponent.cpp
View File

@ -356,7 +356,7 @@ void RacingControlComponent::OnRacingPlayerInfoResetFinished(Entity* player) {
} }
} }
void RacingControlComponent::HandleMessageBoxResponse(Entity* player, const std::string& id) { void RacingControlComponent::HandleMessageBoxResponse(Entity* player, int32_t button, const std::string& id) {
auto* data = GetPlayerData(player->GetObjectID()); auto* data = GetPlayerData(player->GetObjectID());
if (!data) return; if (!data) return;
@ -397,7 +397,8 @@ void RacingControlComponent::HandleMessageBoxResponse(Entity* player, const std:
missionComponent->Progress(eMissionTaskType::RACING, dZoneManager::Instance()->GetZone()->GetWorldID(), (LWOOBJID)eRacingTaskParam::LAST_PLACE_FINISH); // Finished first place in specific world. missionComponent->Progress(eMissionTaskType::RACING, dZoneManager::Instance()->GetZone()->GetWorldID(), (LWOOBJID)eRacingTaskParam::LAST_PLACE_FINISH); // Finished first place in specific world.
} }
} }
} else if (id == "ACT_RACE_EXIT_THE_RACE?" || id == "Exit") {
} else if (id == "ACT_RACE_EXIT_THE_RACE?" && button == m_ActivityExitConfirm) {
Game::logger->Log("RacingControlComponent", "exiting race"); Game::logger->Log("RacingControlComponent", "exiting race");
auto* vehicle = EntityManager::Instance()->GetEntity(data->vehicleID); auto* vehicle = EntityManager::Instance()->GetEntity(data->vehicleID);
if (!vehicle) return; if (!vehicle) return;

6
dGame/dComponents/RacingControlComponent.h
View File

@ -144,7 +144,7 @@ public:
/** /**
* Invoked when the player responds to the GUI. * Invoked when the player responds to the GUI.
*/ */
void HandleMessageBoxResponse(Entity* player, const std::string& id); void HandleMessageBoxResponse(Entity* player, int32_t button, const std::string& id);
/** /**
* Get the racing data from a player's LWOOBJID. * Get the racing data from a player's LWOOBJID.
@ -253,4 +253,8 @@ private:
bool m_DirtyRank; bool m_DirtyRank;
bool m_DirtyLoadPlayer; bool m_DirtyLoadPlayer;
bool m_DirtyLobby; bool m_DirtyLobby;
/**
* Value for message box response to know if we are exiting the race via the activity dialogue
*/
const int32_t m_ActivityExitConfirm = 1;
}; };

2
dGame/dGameMessages/GameMessages.cpp
View File

@ -3891,7 +3891,7 @@ void GameMessages::HandleMessageBoxResponse(RakNet::BitStream* inStream, Entity*
auto* racingControlComponent = entity->GetComponent<RacingControlComponent>(); auto* racingControlComponent = entity->GetComponent<RacingControlComponent>();
if (racingControlComponent != nullptr) { if (racingControlComponent != nullptr) {
racingControlComponent->HandleMessageBoxResponse(userEntity, GeneralUtils::UTF16ToWTF8(identifier)); racingControlComponent->HandleMessageBoxResponse(userEntity, iButton, GeneralUtils::UTF16ToWTF8(identifier));
} }
for (auto* shootingGallery : EntityManager::Instance()->GetEntitiesByComponent(eReplicaComponentType::SHOOTING_GALLERY)) { for (auto* shootingGallery : EntityManager::Instance()->GetEntitiesByComponent(eReplicaComponentType::SHOOTING_GALLERY)) {