From c8b4cbe8d906a5c2a75c4c21be78a074c6d251f1 Mon Sep 17 00:00:00 2001 From: MaddMugsy Date: Fri, 9 Feb 2007 23:54:20 +0000 Subject: [PATCH] -skip the CompatibleFaceItem check if either item is Nothing. This will let us trim some lines from compatiblefaceitems.xml that are screwing up the xml-editor. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@705 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Items.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp index 732f078a1..bd0d0440a 100644 --- a/Tactical/Items.cpp +++ b/Tactical/Items.cpp @@ -2017,6 +2017,11 @@ BOOLEAN CompatibleFaceItem( UINT16 usItem1, UINT16 usItem2 ) { INT32 iLoop = 0; + //Madd: skip this function if either item is nothing + //this will let us trim some lines from compatiblefaceitems.xml + if ( usItem1 == NONE || usItem2 == NONE ) + return TRUE; + // look for the section of the array pertaining to this attachment... while( 1 ) {