isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-31 12:11:15 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Style

Browse Source
This commit is contained in:
Christian Semmler 2024-02-19 08:47:57 -05:00
parent 10fd61e284
commit f4cc66001c
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,7 +107,7 @@ class LegoGameState {
void WriteScoreHistory(); void WriteScoreHistory();
void FUN_1003ccf0(LegoFile&); void FUN_1003ccf0(LegoFile&);
inline Score* GetScore(MxS16 p_index) { return p_index >= m_count ? NULL : m_scores + p_index; } inline Score* GetScore(MxS16 p_index) { return p_index >= m_count ? NULL : &m_scores[p_index]; }
MxS16 m_count; // 0x00 MxS16 m_count; // 0x00
Score m_scores[20]; // 0x02 Score m_scores[20]; // 0x02

9
LEGO1/lego/legoomni/src/isle/historybook.cpp
View File

@ -62,11 +62,11 @@ MxLong HistoryBook::Notify(MxParam& p_param)
return 0; return 0;
} }
inline void SetColor(MxStillPresenter* p_presenter, MxU8 p_color, MxU8 p_colors[], MxU32 p_x, MxU32 p_y) inline void SetColor(MxStillPresenter* p_presenter, MxU8 p_color, MxU8* p_colors, MxU32 p_x, MxU32 p_y)
{ {
if (p_color) { if (p_color) {
for (MxS32 lax = 0; lax < 4; lax++) { for (MxS32 lax = 0; lax < 4; lax++) {
if (p_presenter->GetAlphaMask()) { if (p_presenter->GetAlphaMask() != NULL) {
memset(NULL, p_colors[p_color - 1], 4); memset(NULL, p_colors[p_color - 1], 4);
} }
else { else {
@ -97,7 +97,7 @@ void HistoryBook::ReadyWorld()
LegoGameState::Score* score = GameState()->GetScores()->GetScore(j); LegoGameState::Score* score = GameState()->GetScores()->GetScore(j);
MxS32 scoreIndex = j; MxS32 scoreIndex = j;
MxStillPresenter** scorebox = m_scores + j; MxStillPresenter** scorebox = &m_scores[j];
*scorebox = scoreboxMaster->Clone(); *scorebox = scoreboxMaster->Clone();
MxU32 scoreX = 0x90; MxU32 scoreX = 0x90;
@ -129,15 +129,18 @@ void HistoryBook::ReadyWorld()
MxS16 letterIndex = 0; MxS16 letterIndex = 0;
do { do {
MxS16 letter = score->m_name.m_letters[letterIndex++]; MxS16 letter = score->m_name.m_letters[letterIndex++];
if (letter == -1) { if (letter == -1) {
break; break;
} }
m_names[scoreIndex][letterIndex] = m_alphabet[letter]->Clone(); m_names[scoreIndex][letterIndex] = m_alphabet[letter]->Clone();
m_names[scoreIndex][letterIndex]->Enable(TRUE); m_names[scoreIndex][letterIndex]->Enable(TRUE);
m_names[scoreIndex][letterIndex]->SetTickleState(MxPresenter::e_repeating); m_names[scoreIndex][letterIndex]->SetTickleState(MxPresenter::e_repeating);
m_names[scoreIndex][letterIndex]->SetPosition(scoreX, scoreY); m_names[scoreIndex][letterIndex]->SetPosition(scoreX, scoreY);
scoreX += 0x17; scoreX += 0x17;
} while (letterIndex < 7); } while (letterIndex < 7);
scoreY += 0x1b; scoreY += 0x1b;
} }