From 2cae5ff707eceda4a9b3ae24d8c79922a551e080 Mon Sep 17 00:00:00 2001 From: Wanne Date: Wed, 8 Jul 2009 09:03:11 +0000 Subject: [PATCH] - Bugfix: Adding or removing "possible placement locations" for bloodcats, in any of the bloodcat maps, causes the program to create 0 bloodcats as a "defense mechanism" (by Headrock) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3095 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Soldier Init List.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Tactical/Soldier Init List.cpp b/Tactical/Soldier Init List.cpp index 796601a3..54b6fe43 100644 --- a/Tactical/Soldier Init List.cpp +++ b/Tactical/Soldier Init List.cpp @@ -1938,8 +1938,13 @@ void AddSoldierInitListBloodcats() pSector->bBloodCatPlacements, gWorldSectorY + 'A' - 1, gWorldSectorX, bBloodCatPlacements ); DoScreenIndependantMessageBox( str, MSG_BOX_FLAG_OK, NULL ); #endif - pSector->bBloodCatPlacements = bBloodCatPlacements; - pSector->bBloodCats = -1; + // WANNE: Fix by Headrock + //pSector->bBloodCatPlacements = bBloodCatPlacements; + //pSector->bBloodCats = -1; + + pSector->bBloodCatPlacements = __min(bBloodCatPlacements, pSector->bBloodCatPlacements); + pSector->bBloodCats = __min(pSector->bBloodCats, pSector->bBloodCatPlacements); + if( !bBloodCatPlacements ) { return;