- new <usItemClass>: IC_RANDOMITEM (0x40000000 or 1073741824) is used for random items exclusively.

- increased ma number of Random Items to 1000
- fix: A certain key combination no longer spawns random NATO ARs

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

Tactical/Item Types.h

@@ -619,6 +619,7 @@ extern OBJECTTYPE gTempObject;
 
 #define IC_MISC						0x10000000
 #define IC_MONEY					0x20000000
+#define IC_RANDOMITEM				0x40000000	// added by Flugente for random items
 
 // PARENT TYPES
 #define IC_WEAPON					( IC_GUN | IC_BLADE | IC_THROWING_KNIFE | IC_LAUNCHER | IC_TENTACLES )

Tactical/Items.cpp

@@ -7661,10 +7661,13 @@ BOOLEAN CreateItem( UINT16 usItem, INT16 bStatus, OBJECTTYPE * pObj )
 		return( FALSE );
 	}
 
-	// Flugente: random items
-	UINT16 newitemfromrandom = 0;
-	if ( GetItemFromRandomItem(usItem, &newitemfromrandom) )
-		usItem = newitemfromrandom;
+	// Flugente: random items - not while editing!
+	if ( guiCurrentScreen != EDIT_SCREEN )
+	{
+		UINT16 newitemfromrandom = 0;
+		if ( GetItemFromRandomItem(usItem, &newitemfromrandom) )
+			usItem = newitemfromrandom;
+	}
 
 	if (usItem == 0)
 	{
@@ -14735,7 +14738,7 @@ BOOLEAN	GetFirstClothesItemWithSpecificData( UINT16* pusItem, PaletteRepID aPalV
 	return( FALSE );
 }
 
-#define RANDOM_ITEM_MAX_NUMBER	200
+#define RANDOM_ITEM_MAX_NUMBER 1000
 #define RANDOM_TABOO_MAX		 50
 #define	RANDOM_XML_LENGTH		 10
 

Tactical/Turn Based Input.cpp

@@ -4447,7 +4447,7 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
 				else if ( fAlt )
 				{
 					// Flugente: spawn items while debugging
-					if ( gusSelectedSoldier != NOBODY )
+					/*if ( gusSelectedSoldier != NOBODY )
 					{
 						static UINT16 usitem = 1623;
 						static INT16 status = 100;
@@ -4465,7 +4465,7 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
 						
 						if ( !AutoPlaceObject( MercPtrs[ gusSelectedSoldier ], &newobj, FALSE ) )
 							AddItemToPool( MercPtrs[ gusSelectedSoldier ]->sGridNo, &newobj, 1, 0, 0, -1 );
-					}
+					}*/
 				}
 				else
 				{