Fixed item "beaming" bugs that allowed items to be grabbed from a sector your merc wasn't currently in.

Fixed the map editor so that "Nada" items don't appear in the item lists.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2088 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Editor/EditorItems.cpp

@@ -156,6 +156,8 @@ void EntryInitEditorItemsInfo()
 			item = &Item[i];
 			//if( Item[i].fFlags & ITEM_NOT_EDITOR )
 			//	continue;
+			if(item->notineditor)
+				continue;
 			if( i == SWITCH || i == ACTION_ITEM )
 			{
 
@@ -404,9 +406,10 @@ void InitEditorItemsInfo(UINT32 uiItemType)
 				break;
 			item = &Item[usCounter];
 			//if( Item[usCounter].fFlags & ITEM_NOT_EDITOR )
+			if(item->notineditor)
 			{
-			//	usCounter++;
-			//	continue;
+				usCounter++;
+				continue;
 			}
 			if( eInfo.uiItemType == TBAR_MODE_ITEM_TRIGGERS )
 			{
@@ -1664,3 +1667,4 @@ void DisplayItemStatistics()
 
 
 
+