mirror of
https://github.com/thunderbrewhq/thunderbrew
synced 2026-02-05 01:29:07 +00:00
feat(glue): add realm and character handling (#7)
* fix(build): make project compilable * feat(glue): update Character Selection screen to support switching * fix(ui): fix CSimpleFontString::GetHeight() to use proper method * feat(db): add static database classes from whoa-autocode * feat(ui): use class and area IDs for Character Selection * chore(db): update ItemRandomPropertiesRec * feat(glue): update CCharacterSelection methods * chore(db): uncomment DB records * feat(glue): implement character deletion * feat(gx): update supported text tags in GxuDetermineQuotedCode * fix(ui): fix CSimpleFontString to use the FixedColor flag only if the string does not contain color tags * feat(net): implement GrunLogin::LogOff * feat(net): implement NetClient::Disconnect * feat(login): implement trimming of realm name in LoginResponse::HandleRealmData * feat(net): implement proper disconnection from login and realm servers * feat(net): implement PING/PONG messages * feat(net): add NetClient::Destroy method * feat(net): implement ClientServices::GetRealmList (second request of Realm List) * feat(glue): implement CGlueMgr::PollRealmList * feat(glue): implement CGlueMgr::PollCreateCharacter * chore(glue): add skeleton of CCharacterComponent class * fix(build): fix build using latest features * fix(glue): kill gotos in CGlueMgr::NetDisconnectHandler * fix(build): include SDL3 --------- Co-authored-by: superp00t <superp00t@tutanota.com>
This commit is contained in:
VDm
GitHub
parent
50e37d16bc
commit
957a4c7e2f
633 changed files with 1729 additions and 227 deletions
|
|
@ -1,34 +1,61 @@
|
|||
#include "glue/CCharacterSelection.hpp"
|
||||
#include "model/CM2Model.hpp"
|
||||
#include "model/CM2Shared.hpp"
|
||||
#include "ui/CSimpleModelFFX.hpp"
|
||||
#include "client/ClientServices.hpp"
|
||||
#include "client/Client.hpp"
|
||||
#include "console/CVar.hpp"
|
||||
#include "net/Connection.hpp"
|
||||
#include "clientobject/Player_C.hpp"
|
||||
#include "db/Db.hpp"
|
||||
|
||||
CSimpleModelFFX* CCharacterSelection::m_modelFrame = nullptr;
|
||||
uint32_t CCharacterSelection::m_characterCount = 0;
|
||||
float CCharacterSelection::m_charFacing = 0.0f;
|
||||
uint32_t CCharacterSelection::m_restrictHuman = 0;
|
||||
uint32_t CCharacterSelection::m_restrictDwarf = 0;
|
||||
uint32_t CCharacterSelection::m_restrictGnome = 0;
|
||||
uint32_t CCharacterSelection::m_restrictNightElf = 0;
|
||||
uint32_t CCharacterSelection::m_restrictDraenei = 0;
|
||||
uint32_t CCharacterSelection::m_restrictOrc = 0;
|
||||
uint32_t CCharacterSelection::m_restrictTroll = 0;
|
||||
uint32_t CCharacterSelection::m_restrictTauren = 0;
|
||||
uint32_t CCharacterSelection::m_restrictUndead = 0;
|
||||
uint32_t CCharacterSelection::m_restrictBloodElf = 0;
|
||||
TSGrowableArray<CharacterSelectionDisplay> CCharacterSelection::s_characterList;
|
||||
CSimpleModelFFX* CCharacterSelection::s_modelFrame;
|
||||
float CCharacterSelection::s_charFacing = 0.0f;
|
||||
int32_t CCharacterSelection::m_selectionIndex = 0;
|
||||
|
||||
|
||||
CharacterSelectionDisplay::CharacterSelectionDisplay()
|
||||
: m_characterModel(nullptr) {
|
||||
}
|
||||
|
||||
|
||||
void CCharacterSelection::Initialize() {
|
||||
// Empty method
|
||||
}
|
||||
|
||||
void CCharacterSelection::RenderPrep() {
|
||||
// TODO
|
||||
}
|
||||
|
||||
void CCharacterSelection::SetBackgroundModel(const char* modelPath) {
|
||||
if (!CCharacterSelection::s_modelFrame || !modelPath || !*modelPath) {
|
||||
if (!CCharacterSelection::m_modelFrame || !modelPath || !*modelPath) {
|
||||
return;
|
||||
}
|
||||
|
||||
auto model = CCharacterSelection::s_modelFrame->m_model;
|
||||
auto model = CCharacterSelection::m_modelFrame->m_model;
|
||||
|
||||
// Check if already set
|
||||
if (model && !SStrCmpI(modelPath, model->m_shared->m_filePath, STORM_MAX_STR)) {
|
||||
return;
|
||||
}
|
||||
|
||||
CCharacterSelection::s_modelFrame->SetModel(modelPath);
|
||||
CCharacterSelection::m_modelFrame->SetModel(modelPath);
|
||||
|
||||
// TODO BYTE1(CCharacterSelection::m_modelFrame->simplemodelffx_dword510[3]) = 1;
|
||||
|
||||
model = CCharacterSelection::s_modelFrame->m_model;
|
||||
model = CCharacterSelection::m_modelFrame->m_model;
|
||||
|
||||
if (model) {
|
||||
// TODO lighting callback + arg
|
||||
|
|
@ -37,8 +64,48 @@ void CCharacterSelection::SetBackgroundModel(const char* modelPath) {
|
|||
}
|
||||
}
|
||||
|
||||
void CCharacterSelection::EnumerateCharactersCallback(CHARACTER_INFO& info, void* param) {
|
||||
auto character = CCharacterSelection::s_characterList.New();
|
||||
character->m_characterInfo = info;
|
||||
// TODO: LoadAddOnEnableState(a1 + 8);
|
||||
}
|
||||
|
||||
void CCharacterSelection::ShowCharacter() {
|
||||
auto index = CCharacterSelection::m_selectionIndex;
|
||||
if (index < 0 || index >= CCharacterSelection::GetNumCharacters()) {
|
||||
return;
|
||||
}
|
||||
// TODO
|
||||
|
||||
CCharacterSelection::m_charFacing = 0.0;
|
||||
|
||||
auto& character = CCharacterSelection::s_characterList[index];
|
||||
|
||||
if (character.m_characterModel) {
|
||||
// TODO
|
||||
return;
|
||||
}
|
||||
|
||||
auto rec = Player_C_GetModelName(character.m_characterInfo.raceID, character.m_characterInfo.sexID);
|
||||
STORM_ASSERT(rec);
|
||||
if (!rec->m_modelName) {
|
||||
// TODO
|
||||
return;
|
||||
}
|
||||
|
||||
auto scene = CCharacterSelection::m_modelFrame->GetScene();
|
||||
character.m_characterModel = scene->CreateModel(rec->m_modelName, 0);
|
||||
}
|
||||
|
||||
void CCharacterSelection::SetCharFacing(float facing) {
|
||||
// TODO:
|
||||
if (!CCharacterSelection::m_characterCount || !CCharacterSelection::GetNumCharacters()) {
|
||||
return;
|
||||
}
|
||||
|
||||
auto character = CCharacterSelection::s_characterList[CCharacterSelection::m_selectionIndex];
|
||||
if (character.m_characterModel) {
|
||||
character.m_characterModel->SetWorldTransform(C3Vector(), facing, 1.0);
|
||||
}
|
||||
}
|
||||
|
||||
void CCharacterSelection::ClearCharacterList() {
|
||||
|
|
@ -46,24 +113,46 @@ void CCharacterSelection::ClearCharacterList() {
|
|||
|
||||
void CCharacterSelection::UpdateCharacterList() {
|
||||
// TODO: ClearAddOnEnableState(0);
|
||||
// TODO: Proper implementation
|
||||
|
||||
auto& received = ClientServices::Connection()->m_characterList;
|
||||
CCharacterSelection::s_characterList.SetCount(received.Count());
|
||||
for (uint32_t i = 0; i < received.Count(); ++i) {
|
||||
CCharacterSelection::s_characterList[i].m_characterInfo = received[i];
|
||||
}
|
||||
CCharacterSelection::s_characterList.SetCount(0);
|
||||
|
||||
if (CCharacterSelection::GetNumCharacters()) {
|
||||
int32_t currentIndex = 0;
|
||||
FrameScript_SignalEvent(8, "%d", currentIndex + 1);
|
||||
CCharacterSelection::m_restrictHuman = 0;
|
||||
CCharacterSelection::m_restrictDwarf = 0;
|
||||
CCharacterSelection::m_restrictGnome = 0;
|
||||
CCharacterSelection::m_restrictNightElf = 0;
|
||||
CCharacterSelection::m_restrictDraenei = 0;
|
||||
CCharacterSelection::m_restrictOrc = 0;
|
||||
CCharacterSelection::m_restrictTroll = 0;
|
||||
CCharacterSelection::m_restrictTauren = 0;
|
||||
CCharacterSelection::m_restrictUndead = 0;
|
||||
CCharacterSelection::m_restrictBloodElf = 0;
|
||||
|
||||
ClientServices::EnumerateCharacters(&CCharacterSelection::EnumerateCharactersCallback, nullptr);
|
||||
|
||||
if (CCharacterSelection::s_characterList.Count()) {
|
||||
// TODO: Apply restrictions (m_restrictHuman, etc)
|
||||
// TODO: CRealmList::m_preferredCategory = 0;
|
||||
|
||||
int32_t selectionIndex = Client::g_lastCharacterIndex->GetInt();
|
||||
if (selectionIndex < 0 || selectionIndex >= CCharacterSelection::s_characterList.Count()) {
|
||||
selectionIndex = 0;
|
||||
}
|
||||
|
||||
CCharacterSelection::m_selectionIndex = selectionIndex;
|
||||
CCharacterSelection::ShowCharacter();
|
||||
|
||||
FrameScript_SignalEvent(8, "%d", CCharacterSelection::m_selectionIndex + 1);
|
||||
} else {
|
||||
int32_t currentIndex = 0;
|
||||
FrameScript_SignalEvent(8, "%d", currentIndex + 1);
|
||||
CCharacterSelection::m_selectionIndex = 0;
|
||||
CCharacterSelection::ShowCharacter();
|
||||
FrameScript_SignalEvent(8, "%d", CCharacterSelection::m_selectionIndex + 1);
|
||||
if (CCharacterSelection::m_modelFrame) {
|
||||
// TODO
|
||||
}
|
||||
}
|
||||
FrameScript_SignalEvent(7, nullptr);
|
||||
}
|
||||
|
||||
uint32_t CCharacterSelection::GetNumCharacters() {
|
||||
return s_characterList.Count();
|
||||
return CCharacterSelection::s_characterList.Count();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue