From a95882d50affc114a117839a2c188a5950ecf503 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sun, 15 Jul 2007 13:13:00 +0000
Subject: [PATCH] Some small editor changes for compilation

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1054 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Editor/EditorMercs.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Editor/EditorMercs.cpp b/Editor/EditorMercs.cpp
index 6d164bc8..69d1b66b 100644
--- a/Editor/EditorMercs.cpp
+++ b/Editor/EditorMercs.cpp
@@ -2975,7 +2975,7 @@ void UpdateMercItemSlots()
 	{
 		if( gpSelected->pDetailedPlacement->ubProfile != NO_PROFILE )
 		{
-			memcpy( gpSelected->pDetailedPlacement->Inv, gpSelected->pSoldier->inv, sizeof( OBJECTTYPE ) * NUM_INV_SLOTS );
+			memcpy( &gpSelected->pDetailedPlacement->Inv, &gpSelected->pSoldier->inv, sizeof( OBJECTTYPE ) * NUM_INV_SLOTS );
 		}
 		for( x = 0; x < 9; x++ )
 		{
@@ -3669,7 +3669,8 @@ void PasteMercPlacement( INT32 iMapIndex )
 		if( gTempBasicPlacement.fDetailedPlacement )
 		{
                         // WDS - Clean up inventory handling
-			gTempDetailedPlacement = *gSaveBufferDetailedPlacement
+			// WANNE: Removed the following line, didn't compile
+			//gTempDetailedPlacement = *gSaveBufferDetailedPlacement;
 		}
 		else
 		{