isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2024-11-22 15:37:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement a few RegistrationBook functions (#693)

Browse source 
* Implement a few RegistrationBook functions

* Match functions

* minor style

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
This commit is contained in:
Misha 2024-03-19 10:15:24 -04:00 committed by GitHub
parent 44bc575a2d
commit e454e56b52
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 120 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
LEGO1/lego/legoomni/include/infocenterstate.h
View file

@ -31,6 +31,7 @@ class InfocenterState : public LegoState {
inline MxS16 GetMaxNameLength() { return _countof(m_letters); }
inline MxStillPresenter* GetNameLetter(MxS32 p_index) { return m_letters[p_index]; }
inline void SetNameLetter(MxS32 p_index, MxStillPresenter* p_letter) { m_letters[p_index] = p_letter; }
inline MxBool HasRegistered() { return m_letters[0] != NULL; }
inline Playlist& GetExitDialogueAct1() { return m_exitDialogueAct1; }
inline Playlist& GetExitDialogueAct23() { return m_exitDialogueAct23; }

2
LEGO1/lego/legoomni/include/legogamestate.h
View file

@ -103,7 +103,7 @@ class LegoGameState {
e_unk66 = 66
};
// SIZE 0x0c
// SIZE 0x0e
struct Username {
Username();
inline Username(Username& p_other) { Set(p_other); }

8
LEGO1/lego/legoomni/include/registrationbook.h
View file

@ -2,6 +2,7 @@
#define REGISTRATIONBOOK_H
#include "jukebox.h"
#include "legogamestate.h"
#include "legoworld.h"
#include "mxcontrolpresenter.h"
#include "mxstillpresenter.h"
@ -50,8 +51,7 @@ class RegistrationBook : public LegoWorld {
MxStillPresenter* m_alphabet[26]; // 0x100
MxStillPresenter* m_name[10][7]; // 0x168
struct {
undefined4 m_unk0x00[3]; // 0x00
undefined2 m_unk0x0c; // 0x0c
MxS16 m_letters[7]; // 0x00
undefined2 m_unk0x0e; // 0x0e
} m_unk0x280; // 0x280
MxControlPresenter* m_checkmark[10]; // 0x290
@ -62,13 +62,15 @@ class RegistrationBook : public LegoWorld {
undefined m_unk0x2c2[0x02]; // 0x2c2
undefined4 m_unk0x2c4; // 0x2c4
undefined4 m_unk0x2c8; // 0x2c8
undefined4 m_unk0x2cc; // 0x2cc
LPDIRECTDRAWSURFACE m_unk0x2cc; // 0x2cc
MxLong HandleEndAction(MxEndActionNotificationParam& p_param);
MxLong HandleKeyPress(MxS8 p_key);
MxLong HandleClick(LegoControlManagerEvent& p_param);
MxLong HandleNotification19(MxParam& p_param);
void FUN_100775c0(MxS16 p_playerIndex);
void WriteInfocenterLetters(MxS16);
void FUN_100778c0();
};
#endif // REGISTRATIONBOOK_H

2
LEGO1/lego/legoomni/src/common/legogamestate.cpp
View file

@ -30,7 +30,7 @@
#include <stdio.h>
DECOMP_SIZE_ASSERT(LegoGameState::Username, 0xe)
DECOMP_SIZE_ASSERT(LegoGameState::Username, 0x0e)
DECOMP_SIZE_ASSERT(LegoGameState::ScoreItem, 0x2c)
DECOMP_SIZE_ASSERT(LegoGameState::History, 0x374)
DECOMP_SIZE_ASSERT(LegoGameState, 0x430)

119
LEGO1/lego/legoomni/src/worlds/registrationbook.cpp
View file

@ -25,8 +25,6 @@ RegistrationBook::RegistrationBook() : m_unk0xf8(0x80000000), m_unk0xfc(1)
{
memset(m_alphabet, 0, sizeof(m_alphabet));
memset(m_name, 0, sizeof(m_name));
// May not be part of the struct, but then it would need packing
m_unk0x280.m_unk0x0e = 0;
memset(m_checkmark, 0, sizeof(m_checkmark));
@ -43,10 +41,30 @@ RegistrationBook::RegistrationBook() : m_unk0xf8(0x80000000), m_unk0xfc(1)
m_unk0x2cc = 0;
}
// STUB: LEGO1 0x10076f50
// FUNCTION: LEGO1 0x10076f50
RegistrationBook::~RegistrationBook()
{
// TODO
for (MxS16 i = 0; i < 10; i++) {
for (MxS16 j = 0; j < 7; j++) {
if (m_name[i][j] != NULL) {
delete m_name[i][j]->GetAction();
delete m_name[i][j];
m_name[i][j] = NULL;
}
}
}
InputManager()->UnRegister(this);
if (InputManager()->GetWorld() == this) {
InputManager()->ClearWorld();
}
ControlManager()->Unregister(this);
NotificationManager()->Unregister(this);
if (m_unk0x2cc) {
m_unk0x2cc->Release();
}
}
// FUNCTION: LEGO1 0x10077060
@ -102,10 +120,30 @@ MxLong RegistrationBook::Notify(MxParam& p_param)
return result;
}
// STUB: LEGO1 0x10077210
// FUNCTION: LEGO1 0x10077210
MxLong RegistrationBook::HandleEndAction(MxEndActionNotificationParam& p_param)
{
return 0;
if (p_param.GetAction()->GetAtomId() != m_atom) {
return 0;
}
switch ((MxS32) p_param.GetAction()->GetObjectId()) {
case RegbookScript::c_Textures:
m_unk0x2c1 = 0;
if (m_unk0x2b8 == 0) {
TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
}
break;
case RegbookScript::c_iic006in_RunAnim:
case RegbookScript::c_iic007in_PlayWav:
case RegbookScript::c_iic008in_PlayWav:
BackgroundAudioManager()->RaiseVolume();
m_unk0xf8 = Timer()->GetTime();
break;
}
return 1;
}
// STUB: LEGO1 0x100772d0
@ -159,9 +197,76 @@ MxLong RegistrationBook::HandleClick(LegoControlManagerEvent& p_param)
return 1;
}
// STUB: LEGO1 0x100775c0
// FUNCTION: LEGO1 0x100775c0
void RegistrationBook::FUN_100775c0(MxS16 p_playerIndex)
{
if (m_infocenterState->HasRegistered()) {
GameState()->Save(0);
}
// TODO: structure incorrect
MxS16 player = p_playerIndex == 0 ? GameState()->FindPlayer(*(LegoGameState::Username*) &m_unk0x280.m_letters)
: p_playerIndex - 1;
switch (player) {
case 0:
if (!m_infocenterState->HasRegistered()) {
GameState()->SwitchPlayer(0);
WriteInfocenterLetters(1);
FUN_100778c0();
}
break;
case -1:
GameState()->Init();
PlayAction(RegbookScript::c_Textures);
m_unk0x2c1 = 1;
// TOOD: structure incorrect
GameState()->AddPlayer(*(LegoGameState::Username*) &m_unk0x280.m_letters);
GameState()->Save(0);
WriteInfocenterLetters(0);
GameState()->SerializePlayersInfo(2);
FUN_100778c0();
break;
default:
GameState()->Init();
PlayAction(RegbookScript::c_Textures);
m_unk0x2c1 = 1;
GameState()->SwitchPlayer(player);
WriteInfocenterLetters(player + 1);
GameState()->SerializePlayersInfo(2);
FUN_100778c0();
break;
}
m_infocenterState->SetUnknown0x74(4);
if (m_unk0x2b8 == 0 && m_unk0x2c1 == 0) {
DeleteObjects(&m_atom, RegbookScript::c_iic006in_RunAnim, RegbookScript::c_iic008in_PlayWav);
TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
}
}
// FUNCTION: LEGO1 0x10077860
void RegistrationBook::WriteInfocenterLetters(MxS16 p_user)
{
for (MxS16 i = 0; i < 7; i++) {
delete m_infocenterState->GetNameLetter(i);
m_infocenterState->SetNameLetter(i, m_name[p_user][i]);
m_name[p_user][i] = NULL;
}
}
// STUB: LEGO1 0x100778c0
void RegistrationBook::FUN_100778c0()
{
// TODO
}
// FUNCTION: LEGO1 0x10077cc0