TheCloud/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2025-09-25 21:53:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix -Wwrite-strings warnings (#1267)

Browse Source 
warning: ISO C++ forbids converting a string constant to 'LegoChar*'
This commit is contained in:
Anonymous Maarten 2024-12-24 01:11:38 +01:00 committed by GitHub
parent 3f4732b0bc
commit b4d2ea72af
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,7 @@ public:
void Mute(MxBool p_muted);
private:
static LegoChar* g_lodNames[];
static const LegoChar* g_lodNames[];
static MxLong g_lastHitActorTime;
LegoCacheSound* m_whistleSound; // 0x154

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

@ -166,7 +166,7 @@ public:
MxBool FindVehicle(const char* p_name, MxU32& p_index);
MxResult ReadAnimInfo(LegoFile* p_file, AnimInfo* p_info);
MxResult ReadModelInfo(LegoFile* p_file, ModelInfo* p_info);
void FUN_10060480(LegoChar* p_characterNames[], MxU32 p_numCharacterNames);
void FUN_10060480(const LegoChar* p_characterNames[], MxU32 p_numCharacterNames);
void FUN_100604d0(MxBool p_unk0x08);
void FUN_100604f0(MxS32 p_objectIds[], MxU32 p_numObjectIds);
void FUN_10060540(MxBool p_unk0x29);

2
LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp
View File

@ -881,7 +881,7 @@ void LegoAnimationManager::DeleteAnimations()
// FUNCTION: LEGO1 0x10060480
// FUNCTION: BETA10 0x100412a9
void LegoAnimationManager::FUN_10060480(LegoChar* p_characterNames[], MxU32 p_numCharacterNames)
void LegoAnimationManager::FUN_10060480(const LegoChar* p_characterNames[], MxU32 p_numCharacterNames)
{
for (MxS32 i = 0; i < p_numCharacterNames; i++) {
for (MxS32 j = 0; j < sizeOfArray(g_characters); j++) {

2
LEGO1/lego/legoomni/src/entity/act2brick.cpp
View File

@ -19,7 +19,7 @@
DECOMP_SIZE_ASSERT(Act2Brick, 0x194)
// GLOBAL: LEGO1 0x100f7a38
LegoChar* Act2Brick::g_lodNames[] =
const LegoChar* Act2Brick::g_lodNames[] =
{"xchbase1", "xchblad1", "xchseat1", "xchtail1", "xhback1", "xhljet1", "xhmidl1", "xhmotr1", "xhsidl1", "xhsidr1"};
// GLOBAL: LEGO1 0x100f7a60

4
LEGO1/lego/legoomni/src/race/carrace.cpp
View File

@ -59,11 +59,11 @@ MxS32 CarRace::g_unk0x100d5d60[] =
// GLOBAL: LEGO1 0x100f0c70
// STRING: LEGO1 0x100f0c48
LegoChar* g_strCRCFRNTY6 = "C_RCFRNTY6";
const LegoChar* g_strCRCFRNTY6 = "C_RCFRNTY6";
// GLOBAL: LEGO1 0x100f0c74
// STRING: LEGO1 0x100f0c3c
LegoChar* g_strCRCEDGEY0 = "C_RCEDGEY0";
const LegoChar* g_strCRCEDGEY0 = "C_RCEDGEY0";
// GLOBAL: LEGO1 0x100f0c7c
MxS32 g_unk0x100f0c7c = 2;

4
LEGO1/lego/legoomni/src/worlds/legoact2.cpp
View File

@ -49,7 +49,7 @@ MxS32 g_unk0x100f43f0[] = {
};
// GLOBAL: LEGO1 0x100f4410
LegoChar* g_unk0x100f4410[] = {"bd", "pg", "rd", "sy", "ro", "cl"};
const LegoChar* g_unk0x100f4410[] = {"bd", "pg", "rd", "sy", "ro", "cl"};
// GLOBAL: LEGO1 0x100f4428
MxS32 g_unk0x100f4428[] = {
@ -68,7 +68,7 @@ MxS32 g_unk0x100f4428[] = {
};
// GLOBAL: LEGO1 0x100f4458
LegoChar* g_unk0x100f4458[] = {"papa", "nick", "laura", "cl", "pg", "rd", "sy"};
const LegoChar* g_unk0x100f4458[] = {"papa", "nick", "laura", "cl", "pg", "rd", "sy"};
// FUNCTION: LEGO1 0x1004fce0
// FUNCTION: BETA10 0x1003a5a0