diff --git a/LEGO1/lego/legoomni/include/pizza.h b/LEGO1/lego/legoomni/include/pizza.h index 065d6a3d..a3d554fe 100644 --- a/LEGO1/lego/legoomni/include/pizza.h +++ b/LEGO1/lego/legoomni/include/pizza.h @@ -6,7 +6,7 @@ #include "isleactor.h" #include "legostate.h" -#include +#include class Act1State; class PizzeriaState; diff --git a/LEGO1/lego/legoomni/src/common/legoutils.cpp b/LEGO1/lego/legoomni/src/common/legoutils.cpp index ef4e9ffc..0f5f641c 100644 --- a/LEGO1/lego/legoomni/src/common/legoutils.cpp +++ b/LEGO1/lego/legoomni/src/common/legoutils.cpp @@ -321,8 +321,7 @@ void InvokeAction(Extra::ActionType p_actionId, const MxAtomId& p_pAtom, MxS32 p break; case Extra::ActionType::e_run: { - const char* args[] = - {"/lego/sources/main/main.exe", "/script", p_pAtom.GetInternal(), NULL}; + const char* args[] = {"/lego/sources/main/main.exe", "/script", p_pAtom.GetInternal(), NULL}; SDL_Process* process = SDL_CreateProcess(args, false); } break; case Extra::ActionType::e_enable: diff --git a/LEGO1/lego/sources/misc/legoimage.cpp b/LEGO1/lego/sources/misc/legoimage.cpp index a9337593..0e72b1fe 100644 --- a/LEGO1/lego/sources/misc/legoimage.cpp +++ b/LEGO1/lego/sources/misc/legoimage.cpp @@ -88,11 +88,11 @@ LegoResult LegoImage::Read(LegoStorage* p_storage, LegoU32 p_square) } m_palette = SDL_CreatePalette(count); for (LegoU32 i = 0; i < count; i++) { - LegoPaletteEntry palette_entry; - if ((result = palette_entry.Read(p_storage)) != SUCCESS) { + LegoPaletteEntry paletteEntry; + if ((result = paletteEntry.Read(p_storage)) != SUCCESS) { return result; } - m_palette->colors[i] = palette_entry.getColor(); + m_palette->colors[i] = paletteEntry.GetColor(); } if (m_surface) { SDL_DestroySurface(m_surface); @@ -168,7 +168,7 @@ LegoResult LegoImage::Write(LegoStorage* p_storage) if (m_palette) { LegoPaletteEntry paletteEntry; for (LegoU32 i = 0; i < m_palette->ncolors; i++) { - paletteEntry.setColor(m_palette->colors[i]); + paletteEntry.SetColor(m_palette->colors[i]); if ((result = paletteEntry.Write(p_storage)) != SUCCESS) { return result; } diff --git a/LEGO1/lego/sources/misc/legoimage.h b/LEGO1/lego/sources/misc/legoimage.h index 0b54ea5c..ee1dc55d 100644 --- a/LEGO1/lego/sources/misc/legoimage.h +++ b/LEGO1/lego/sources/misc/legoimage.h @@ -18,8 +18,8 @@ class LegoPaletteEntry { void SetGreen(LegoU8 p_green) { m_color.g = p_green; } LegoU8 GetBlue() const { return m_color.b; } void SetBlue(LegoU8 p_blue) { m_color.b = p_blue; } - SDL_Color getColor() const { return m_color; } - void setColor(SDL_Color p_color) { m_color = p_color; } + SDL_Color GetColor() const { return m_color; } + void SetColor(SDL_Color p_color) { m_color = p_color; } LegoResult Read(LegoStorage* p_storage); LegoResult Write(LegoStorage* p_storage) const; @@ -44,7 +44,7 @@ class LegoImage { } void SetPaletteEntry(LegoU32 p_i, LegoPaletteEntry& p_paletteEntry) { - m_palette->colors[p_i] = p_paletteEntry.getColor(); + m_palette->colors[p_i] = p_paletteEntry.GetColor(); } const LegoU8* GetBits() const { return (LegoU8*) m_surface->pixels; } LegoResult Read(LegoStorage* p_storage, LegoU32 p_square);