From 17821ea3f866829e5f9166f026f4a76b01227f7f Mon Sep 17 00:00:00 2001 From: Wanne Date: Tue, 10 Jun 2014 19:41:04 +0000 Subject: [PATCH] Merged from revision: 7270 - Fixed previous creature site habitat data not cleared resulting in incorrect creature spawning sectors (by Buggler) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7271 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Strategic/XML_Creatures.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Strategic/XML_Creatures.cpp b/Strategic/XML_Creatures.cpp index d51b4103..9fb161d4 100644 --- a/Strategic/XML_Creatures.cpp +++ b/Strategic/XML_Creatures.cpp @@ -427,6 +427,13 @@ creatureplacementEndElementHandle(void *userData, const XML_Char *name) gCreaturePlacements[pData->curIndex].Habitat[y].ubZ = pData->curPlacementInfo.Habitat[y].ubZ; gCreaturePlacements[pData->curIndex].Habitat[y].ubComposition = pData->curPlacementInfo.Habitat[y].ubComposition; gCreaturePlacements[pData->curIndex].Habitat[y].fValid = pData->curPlacementInfo.Habitat[y].fValid; + + // Clear pData Habitat Array as different creature site has different number of habitats + pData->curPlacementInfo.Habitat[y].sX = 0; + pData->curPlacementInfo.Habitat[y].sY = 0; + pData->curPlacementInfo.Habitat[y].ubZ = 0; + pData->curPlacementInfo.Habitat[y].ubComposition = 0; + pData->curPlacementInfo.Habitat[y].fValid = 0; } } }