feat(glue): update CCharacterSelection

This commit is contained in:
VDm committed 2025-06-19 00:54:34 +04:00
1 parent c98a41a761
commit 57980ba822
7 files changed
+100 -34

No files matched your search

+1 -1
View File
@@ -148,7 +148,7 @@ void CCharacterCreation::InitCharacterComponent(ComponentData* data, int32_t ran
if (CCharacterCreation::m_character) {
auto model = CCharacterCreation::m_character->m_data.m_model;
if (model->m_attachParent) {
// TODO: model->DetachFromParent();
model->DetachFromParent();
}
CCharacterComponent::FreeComponent(CCharacterCreation::m_character);
}
+69 -1
View File
@@ -8,6 +8,7 @@
#include "net/Connection.hpp"
#include "clientobject/Player_C.hpp"
#include "db/Db.hpp"
#include "glue/CGlueMgr.hpp"
#include "glue/CCharacterComponent.hpp"
CSimpleModelFFX* CCharacterSelection::m_modelFrame = nullptr;
@@ -143,6 +144,36 @@ void CCharacterSelection::ShowCharacter() {
// Handle hand items
++CCharacterSelection::m_characterCount;
// DUPLICATE (goto in the OG)
if (character.m_component) {
// TODO: info = DayNightGetInfo();
float v42;
if (character.m_characterInfo.flags & 0x2000) {
// FFX::SetEffect(CGlueMgr__m_deathEffect);
v42 = 0.15f;
} else {
// FFX::SetEffect(CGlueMgr__m_glowEffect);
v42 = 0.4f;
}
// *((float *)info + 75) = v42;
if (CCharacterSelection::m_modelFrame->m_model) {
character.m_component->m_data.m_model->AttachToParent(
CCharacterSelection::m_modelFrame->m_model,
0,
nullptr,
0);
if (character.m_petModel) {
character.m_petModel->AttachToParent(
CCharacterSelection::m_modelFrame->m_model, 1, nullptr, 0);
}
}
// TODO: sub_4E6AE0((int)s_charList.m_data[selectionIndex2].m_component, v5);
return;
}
}
void CCharacterSelection::SetCharFacing(float facing) {
@@ -164,6 +195,25 @@ void CCharacterSelection::SetCharFacing(float facing) {
}
void CCharacterSelection::ClearCharacterList() {
CCharacterSelection::s_characterList.Clear();
if (CCharacterSelection::m_modelFrame) {
auto model = CCharacterSelection::m_modelFrame->m_model;
if (model) {
model->DetachAllChildrenById(0);
model->DetachAllChildrenById(1);
}
}
CCharacterSelection::m_selectionIndex = 0;
CCharacterSelection::ShowCharacter();
FrameScript_SignalEvent(8, "%d", CCharacterSelection::m_selectionIndex + 1);
if (CCharacterSelection::m_modelFrame) {
CCharacterSelection::m_modelFrame->SetCameraByIndex(0);
}
FrameScript_SignalEvent(7, nullptr);
}
void CCharacterSelection::UpdateCharacterList() {
@@ -200,14 +250,32 @@ void CCharacterSelection::UpdateCharacterList() {
} else {
CCharacterSelection::m_selectionIndex = 0;
CCharacterSelection::ShowCharacter();
FrameScript_SignalEvent(8, "%d", CCharacterSelection::m_selectionIndex + 1);
if (CCharacterSelection::m_modelFrame) {
// TODO
auto model = CCharacterSelection::m_modelFrame->m_model;
if (model) {
model->DetachAllChildrenById(0);
model->DetachAllChildrenById(1);
}
}
}
FrameScript_SignalEvent(7, nullptr);
}
void CCharacterSelection::OnGetCharacterList() {
CCharacterSelection::s_characterList.Clear();
if (CCharacterSelection::m_modelFrame) {
auto model = CCharacterSelection::m_modelFrame->m_model;
if (model) {
model->DetachAllChildrenById(0);
model->DetachAllChildrenById(1);
}
}
CGlueMgr::GetCharacterList();
}
uint32_t CCharacterSelection::GetNumCharacters() {
return CCharacterSelection::s_characterList.Count();
}
+1
View File
@@ -44,6 +44,7 @@ class CCharacterSelection {
static void SetCharFacing(float facing);
static void ClearCharacterList();
static void UpdateCharacterList();
static void OnGetCharacterList();
static uint32_t GetNumCharacters();
};
+1 -1
View File
@@ -994,7 +994,7 @@ void CGlueMgr::StatusDialogClick() {
case IDLE_ACCOUNT_LOGIN:
case IDLE_CHARACTER_LIST: {
ClientServices::Connection()->Cancel(2);
CCharacterSelection::ClearCharacterList();
break;
}