diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp index 8a6baa35..453ce64e 100644 --- a/ISLE/isleapp.cpp +++ b/ISLE/isleapp.cpp @@ -531,10 +531,11 @@ void IsleApp::LoadConfig() iniConfig = new char[strlen(prefPath) + strlen("isle.ini") + 1](); strcat(iniConfig, prefPath); strcat(iniConfig, "isle.ini"); - } else { - iniConfig = new char[strlen("isle.ini") + 1]; - strcpy(iniConfig, "isle.ini"); - } + } + else { + iniConfig = new char[strlen("isle.ini") + 1]; + strcpy(iniConfig, "isle.ini"); + } SDL_Log("Reading configuration from \"%s\"", iniConfig); dictionary* dict = iniparser_load(iniConfig); @@ -549,8 +550,8 @@ void IsleApp::LoadConfig() strcpy(m_cdPath, cdPath); MxOmni::SetCD(m_cdPath); - const char *mediaPath = iniparser_getstring(dict, "isle:mediapath", cdPath); - m_mediaPath = new char[strlen(mediaPath) + 1]; + const char* mediaPath = iniparser_getstring(dict, "isle:mediapath", cdPath); + m_mediaPath = new char[strlen(mediaPath) + 1]; strcpy(m_mediaPath, mediaPath); m_flipSurfaces = iniparser_getboolean(dict, "isle:Flip Surfaces", m_flipSurfaces); diff --git a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h index 4ee0bbae..a88c62f0 100644 --- a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h +++ b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h @@ -69,11 +69,11 @@ class LegoEventNotificationParam : public MxNotificationParam { void SetY(MxS32 p_y) { m_y = p_y; } protected: - MxU8 m_modifier; // 0x0c - MxS32 m_x; // 0x10 - MxS32 m_y; // 0x14 - SDL_Keycode m_key;// 0x18 - LegoROI* m_roi; // 0x1c + MxU8 m_modifier; // 0x0c + MxS32 m_x; // 0x10 + MxS32 m_y; // 0x14 + SDL_Keycode m_key; // 0x18 + LegoROI* m_roi; // 0x1c }; // SYNTHETIC: LEGO1 0x10028770 diff --git a/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp b/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp index 4c4da07f..4ccf3ea3 100644 --- a/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp +++ b/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp @@ -184,7 +184,9 @@ MxLong RegistrationBook::HandleKeyPress(SDL_Keycode p_key) m_name[0][m_unk0x280.m_cursorPos] = m_alphabet[key - 'A']->Clone(); if (m_name[0][m_unk0x280.m_cursorPos] != NULL) { - m_alphabet[key - SDLK_A]->GetAction()->SetUnknown24(m_alphabet[key - SDLK_A]->GetAction()->GetUnknown24() + 1); + m_alphabet[key - SDLK_A]->GetAction()->SetUnknown24( + m_alphabet[key - SDLK_A]->GetAction()->GetUnknown24() + 1 + ); m_name[0][m_unk0x280.m_cursorPos]->Enable(TRUE); m_name[0][m_unk0x280.m_cursorPos]->SetTickleState(MxPresenter::e_repeating); m_name[0][m_unk0x280.m_cursorPos]->SetPosition(m_unk0x280.m_cursorPos * 23 + 343, 121);