Techwizz/EQ2EMu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

More nix fixes...

Browse source
This commit is contained in:
Image 2020-03-16 15:02:10 -04:00
parent 7230904f7b
commit 05e065279b
2 changed files with 3 additions and 3 deletions
EQ2/source/WorldServer/Zone
ChestTrap.cppChestTrap.h

4
EQ2/source/WorldServer/Zone/ChestTrap.cpp
View file

@ -35,7 +35,7 @@ bool ChestTrapList::GetChestTrap(int32 id, ChestTrap::ChestTrapInfo* cti) {
memset(cti, 0, sizeof(ChestTrap::ChestTrapInfo));
if (res)
memcpy(cti, &res->GetChestTrapInfo(), sizeof(ChestTrap::ChestTrapInfo));
memcpy(cti, res->GetChestTrapInfo(), sizeof(ChestTrap::ChestTrapInfo));
MChestTrapList.releasereadlock(__FUNCTION__, __LINE__);
return cti;
@ -76,7 +76,7 @@ bool ChestTrapList::GetNextChestTrap(ChestTrap::ChestTrapInfo* cti) {
memset(cti, 0, sizeof(ChestTrap::ChestTrapInfo));
if (trap)
memcpy(cti, &trap->GetChestTrapInfo(), sizeof(ChestTrap::ChestTrapInfo));
memcpy(cti, trap->GetChestTrapInfo(), sizeof(ChestTrap::ChestTrapInfo));
cycleItr++;
MChestTrapList.releasewritelock(__FUNCTION__, __LINE__);

2
EQ2/source/WorldServer/Zone/ChestTrap.h
View file

@ -51,7 +51,7 @@ public:
int32 GetSpellID() { return s_ChestTrapInfo.spell_id; }
int32 GetSpellTier() { return s_ChestTrapInfo.spell_tier; }
ChestTrapInfo GetChestTrapInfo() { return s_ChestTrapInfo; }
ChestTrapInfo* GetChestTrapInfo() { return &s_ChestTrapInfo; }
private:
ChestTrapInfo s_ChestTrapInfo;
};