Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-10 04:26:42 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup

Browse source
This commit is contained in:
Lwmte 2021-10-10 16:32:50 +03:00
parent 4e1dd2fe20
commit e55ea8033c
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
TR5Main/Game/control/lot.cpp
View file

@ -145,17 +145,18 @@ void InitialiseSlot(short itemNum, short slot)
creature->LOT.fly = NO_FLYING; creature->LOT.fly = NO_FLYING;
creature->LOT.blockMask = BLOCKED; creature->LOT.blockMask = BLOCKED;
creature->aiTargetNum = CreateItem(); creature->aiTargetNum = CreateItem();
if (creature->aiTargetNum != NO_ITEM) {
if (creature->aiTargetNum != NO_ITEM)
creature->aiTarget = &g_Level.Items[creature->aiTargetNum]; creature->aiTarget = &g_Level.Items[creature->aiTargetNum];
} else
else {
creature->aiTarget = nullptr; creature->aiTarget = nullptr;
}
if (obj->intelligent) if (obj->intelligent)
{ {
// simple check to set hitEffect to blood or smoke by default if intelligent enabled and no value assigned to hitEffect and the entity have HP ! // simple check to set hitEffect to blood or smoke by default if intelligent enabled
// and no value assigned to hitEffect and the entity have HP !
// undead have smoke instead of blood ! // undead have smoke instead of blood !
if (obj->hitEffect == HIT_NONE) if (obj->hitEffect == HIT_NONE)
{ {
if (obj->undead) if (obj->undead)

5
TR5Main/Game/savegame.cpp
View file

@ -995,6 +995,8 @@ bool SaveGame::readItemChunks(ChunkId* chunkId, int maxSize, int itemNumber)
creature->mood = (MOOD_TYPE)LEB128::ReadInt32(m_stream); creature->mood = (MOOD_TYPE)LEB128::ReadInt32(m_stream);
ITEM_INFO* enemy = (ITEM_INFO*)LEB128::ReadLong(m_stream); ITEM_INFO* enemy = (ITEM_INFO*)LEB128::ReadLong(m_stream);
// TODO: Savegame will be rewritten.
//creature->enemy = AddPtr(enemy, ITEM_INFO, malloc_buffer); //creature->enemy = AddPtr(enemy, ITEM_INFO, malloc_buffer);
/* /*
creature->aiTarget.objectNumber = from_underlying(LEB128::ReadInt16(m_stream)); creature->aiTarget.objectNumber = from_underlying(LEB128::ReadInt16(m_stream));
@ -1124,6 +1126,8 @@ void SaveGame::saveItemIntelligentData(int arg1, int arg2)
LEB128::Write(m_stream, creature->monkeyAhead); LEB128::Write(m_stream, creature->monkeyAhead);
LEB128::Write(m_stream, creature->mood); LEB128::Write(m_stream, creature->mood);
LEB128::Write(m_stream, (int)enemy); LEB128::Write(m_stream, (int)enemy);
// TODO: Savegames will be rewritten.
/* /*
LEB128::Write(m_stream, creature->aiTarget.objectNumber); LEB128::Write(m_stream, creature->aiTarget.objectNumber);
LEB128::Write(m_stream, creature->aiTarget.roomNumber); LEB128::Write(m_stream, creature->aiTarget.roomNumber);
@ -1136,6 +1140,7 @@ void SaveGame::saveItemIntelligentData(int arg1, int arg2)
LEB128::Write(m_stream, creature->aiTarget.pos.yRot); LEB128::Write(m_stream, creature->aiTarget.pos.yRot);
LEB128::Write(m_stream, creature->aiTarget.pos.zRot); LEB128::Write(m_stream, creature->aiTarget.pos.zRot);
*/ */
LEB128::Write(m_stream, creature->LOT.canJump); LEB128::Write(m_stream, creature->LOT.canJump);
LEB128::Write(m_stream, creature->LOT.canMonkey); LEB128::Write(m_stream, creature->LOT.canMonkey);
LEB128::Write(m_stream, creature->LOT.isAmphibious); LEB128::Write(m_stream, creature->LOT.isAmphibious);