Space Viking's many mercs changes plus numerous generic bug fixes

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

Standard Gaming Platform/random.h

@@ -6,23 +6,12 @@
 #include <stdlib.h>
 #include <time.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 extern void InitializeRandom(void);
 extern UINT32 Random( UINT32 uiRange );
 
 //Chance( 74 ) returns TRUE 74% of the time.	If uiChance >= 100, then it will always return TRUE.
 extern BOOLEAN Chance( UINT32 uiChance );
 
-//Wizardry can use it too, but I'm saving them a K in the meantime...
-//If Wizardry wants it, then removing the #ifdef JA2 will make it work.
-#ifdef JA2
-	#define PRERANDOM_GENERATOR
-#endif
-
-#ifdef PRERANDOM_GENERATOR
 	//Returns a pregenerated random number.	
 	//Used to deter Ian's tactic of shoot, miss, restore saved game :)
 	extern UINT32 PreRandom( UINT32 uiRange );
@@ -33,10 +22,6 @@ extern BOOLEAN Chance( UINT32 uiChance );
 	#define MAX_PREGENERATED_NUMS			256		
 	extern UINT32 guiPreRandomIndex;
 	extern UINT32 guiPreRandomNums[ MAX_PREGENERATED_NUMS ];
-#endif
 
-#ifdef __cplusplus
-}
-#endif
 
 #endif