Merged from revision: 7262

Fixes (by anv)
- fix: comparison feature would sometimes show comparison with empty sector inventory slots,
- fix: enemy taunts aimed at NOBODY could cause out of range,
- fix: list of boxers fought per day is properly reset when fight club reopens,
- fix: Van Haussen won't offer a fight or accept bets if all boxers are dead (even if our mercs stand on corpses),
- fix: boxing opponents won't try to call reinforcements any more.

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

Strategic/LuaInitNPCs.cpp

@@ -8246,8 +8246,8 @@ int i;
 
 	for (i= 1; i<=n; i++ )
 	{
-		if (i == 1 ) id = lua_tointeger(L,n);
-		if (i == 2 ) Bool = lua_toboolean(L,n);
+		if (i == 1 ) id = lua_tointeger(L,i);
+		if (i == 2 ) Bool = lua_toboolean(L,i);
 	}
 
 gfBoxerFought[id] = Bool;

Strategic/Quests.cpp

@@ -1144,7 +1144,8 @@ BOOLEAN CheckFact( UINT16 usFact, UINT8 ubProfileID )
 			break;
 
 		case FACT_NO_CLUB_FIGHTING_ALLOWED:
-			gubFact[usFact] = ( gubQuest[ QUEST_KINGPIN_MONEY ] == QUESTINPROGRESS || gfBoxersResting );// plus other conditions
+			// anv: added !BoxersAvailable, otherwise van Haussen would offer fight even when all boxers are dead
+			gubFact[usFact] = ( gubQuest[ QUEST_KINGPIN_MONEY ] == QUESTINPROGRESS || gfBoxersResting || !BoxersAvailable() );// plus other conditions
 			break;
 
 		case FACT_MADDOG_IS_SPEAKER:

Strategic/Quests.h

@@ -474,6 +474,8 @@ enum Facts
 
 	FACT_MADDOG_IS_SPEAKER =																	280,
 
+	FACT_VAN_HAUSSEN_EXPLAINED_BOXING_RULES =												281,
+
 	FACT_ANGEL_MENTIONED_DEED =																282,
 	FACT_IGGY_AVAILABLE_TO_ARMY,//														283
 	FACT_PC_HAS_CONRADS_RECRUIT_OPINION,//										284