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

Naming

Browse Source
This commit is contained in:
Christian Semmler 2024-12-28 08:41:56 -07:00
parent bf686b4a17
commit 612b28c1fb
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@
#include "isleactor.h" #include "isleactor.h"
#include "legostate.h" #include "legostate.h"
#include <climits> #include <limits.h>
class Act1State; class Act1State;
class PizzeriaState; class PizzeriaState;

3
LEGO1/lego/legoomni/src/common/legoutils.cpp
View File

@ -321,8 +321,7 @@ void InvokeAction(Extra::ActionType p_actionId, const MxAtomId& p_pAtom, MxS32 p
break; break;
case Extra::ActionType::e_run: { case Extra::ActionType::e_run: {
const char* args[] = const char* args[] = {"/lego/sources/main/main.exe", "/script", p_pAtom.GetInternal(), NULL};
{"/lego/sources/main/main.exe", "/script", p_pAtom.GetInternal(), NULL};
SDL_Process* process = SDL_CreateProcess(args, false); SDL_Process* process = SDL_CreateProcess(args, false);
} break; } break;
case Extra::ActionType::e_enable: case Extra::ActionType::e_enable:

8
LEGO1/lego/sources/misc/legoimage.cpp
View File

@ -88,11 +88,11 @@ LegoResult LegoImage::Read(LegoStorage* p_storage, LegoU32 p_square)
} }
m_palette = SDL_CreatePalette(count); m_palette = SDL_CreatePalette(count);
for (LegoU32 i = 0; i < count; i++) { for (LegoU32 i = 0; i < count; i++) {
LegoPaletteEntry palette_entry; LegoPaletteEntry paletteEntry;
if ((result = palette_entry.Read(p_storage)) != SUCCESS) { if ((result = paletteEntry.Read(p_storage)) != SUCCESS) {
return result; return result;
} }
m_palette->colors[i] = palette_entry.getColor(); m_palette->colors[i] = paletteEntry.GetColor();
} }
if (m_surface) { if (m_surface) {
SDL_DestroySurface(m_surface); SDL_DestroySurface(m_surface);
@ -168,7 +168,7 @@ LegoResult LegoImage::Write(LegoStorage* p_storage)
if (m_palette) { if (m_palette) {
LegoPaletteEntry paletteEntry; LegoPaletteEntry paletteEntry;
for (LegoU32 i = 0; i < m_palette->ncolors; i++) { 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) { if ((result = paletteEntry.Write(p_storage)) != SUCCESS) {
return result; return result;
} }

6
LEGO1/lego/sources/misc/legoimage.h
View File

@ -18,8 +18,8 @@ class LegoPaletteEntry {
void SetGreen(LegoU8 p_green) { m_color.g = p_green; } void SetGreen(LegoU8 p_green) { m_color.g = p_green; }
LegoU8 GetBlue() const { return m_color.b; } LegoU8 GetBlue() const { return m_color.b; }
void SetBlue(LegoU8 p_blue) { m_color.b = p_blue; } void SetBlue(LegoU8 p_blue) { m_color.b = p_blue; }
SDL_Color getColor() const { return m_color; } SDL_Color GetColor() const { return m_color; }
void setColor(SDL_Color p_color) { m_color = p_color; } void SetColor(SDL_Color p_color) { m_color = p_color; }
LegoResult Read(LegoStorage* p_storage); LegoResult Read(LegoStorage* p_storage);
LegoResult Write(LegoStorage* p_storage) const; LegoResult Write(LegoStorage* p_storage) const;
@ -44,7 +44,7 @@ class LegoImage {
} }
void SetPaletteEntry(LegoU32 p_i, LegoPaletteEntry& p_paletteEntry) 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; } const LegoU8* GetBits() const { return (LegoU8*) m_surface->pixels; }
LegoResult Read(LegoStorage* p_storage, LegoU32 p_square); LegoResult Read(LegoStorage* p_storage, LegoU32 p_square);