From cc7afa2603450426bb48b6e345f9a69d07577e64 Mon Sep 17 00:00:00 2001 From: MaddMugsy Date: Sat, 5 May 2012 06:02:19 +0000 Subject: [PATCH] Enabled default attachments to have their own default attachments git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5261 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Items.cpp | 2 +- Tactical/World Items.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp index 9e2f4b8e..cafd1751 100644 --- a/Tactical/Items.cpp +++ b/Tactical/Items.cpp @@ -7363,7 +7363,7 @@ BOOLEAN CreateItem( UINT16 usItem, INT16 bStatus, OBJECTTYPE * pObj ) break; //cannot use gTempObject - static OBJECTTYPE defaultAttachment; + OBJECTTYPE defaultAttachment; CreateItem(Item [ usItem ].defaultattachments[cnt],100,&defaultAttachment); pObj->AttachObject(NULL,&defaultAttachment, FALSE); } diff --git a/Tactical/World Items.cpp b/Tactical/World Items.cpp index 9bb5fdda..a0bef163 100644 --- a/Tactical/World Items.cpp +++ b/Tactical/World Items.cpp @@ -683,7 +683,7 @@ void LoadWorldItemsFromMap( INT8 **hBuffer, float dMajorMapVersion, int ubMinorM break; //cannot use gTempObject - static OBJECTTYPE defaultAttachment; + OBJECTTYPE defaultAttachment; CreateItem(Item [ dummyItem.object.usItem ].defaultattachments[cnt],100,&defaultAttachment); dummyItem.object.AttachObject(NULL,&defaultAttachment, FALSE); }