Work on tomorrow

This commit is contained in:
dinomking33
2024-06-02 04:18:20 -05:00
parent 420822aab4
commit 7a325470f1
5 changed files with 70 additions and 46 deletions

View File

@@ -980,7 +980,7 @@ void GameMessages::SendResurrect(Entity* entity) {
destroyableComponent->SetImagination(imaginationToRestore);
}
}
});
});
CBITSTREAM;
CMSGHEADER;
@@ -5110,12 +5110,12 @@ void GameMessages::HandleMissionDialogOK(RakNet::BitStream& inStream, Entity* en
}
if (Game::config->GetValue("allow_players_to_skip_cinematics") != "1"
|| !player->GetCharacter()
|| !player->GetCharacter()->GetPlayerFlag(ePlayerFlag::DLU_SKIP_CINEMATICS)) return;
|| !player->GetCharacter()
|| !player->GetCharacter()->GetPlayerFlag(ePlayerFlag::DLU_SKIP_CINEMATICS)) return;
player->AddCallbackTimer(0.5f, [player]() {
if (!player) return;
GameMessages::SendEndCinematic(player->GetObjectID(), u"", player->GetSystemAddress());
});
});
}
void GameMessages::HandleRequestLinkedMission(RakNet::BitStream& inStream, Entity* entity) {
@@ -6210,3 +6210,27 @@ void GameMessages::SendSlashCommandFeedbackText(Entity* entity, std::u16string t
auto sysAddr = entity->GetSystemAddress();
SEND_PACKET;
}
void GameMessages::SendMoveItemInInventory(
const LWOOBJID objectId,
const SystemAddress& sysAddr,
eInventoryType destination,
const LWOOBJID item,
const eInventoryType source,
const int32_t responseCode,
const int32_t slot) {
CBITSTREAM;
CMSGHEADER;
bitStream.Write(objectId);
bitStream.Write(eGameMessageType::MOVE_ITEM_IN_INVENTORY);
bitStream.Write(destination != eInventoryType::INVALID);
if (destination != eInventoryType::INVALID) bitStream.Write(destination);
bitStream.Write(item);
bitStream.Write(source);
bitStream.Write(responseCode);
bitStream.Write(slot);
SEND_PACKET;
}

View File

@@ -666,6 +666,16 @@ namespace GameMessages {
void HandleCancelDonationOnPlayer(RakNet::BitStream& inStream, Entity* entity);
void SendSlashCommandFeedbackText(Entity* entity, std::u16string text);
void SendMoveItemInInventory(
const LWOOBJID objectId,
const SystemAddress& sysAddr,
eInventoryType destination,
const LWOOBJID item,
const eInventoryType source,
const int32_t responseCode,
const int32_t slot
);
};
#endif // GAMEMESSAGES_H