Browse Source

More nix fixes...

Image 4 years ago
parent
commit
05e065279b

+ 2 - 2
EQ2/source/WorldServer/Zone/ChestTrap.cpp

@@ -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__);

+ 1 - 1
EQ2/source/WorldServer/Zone/ChestTrap.h

@@ -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;
 };