From 1383b4ad23c8c012c54ba04f0871802b2c95c7a5 Mon Sep 17 00:00:00 2001
From: lalien <lalien@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Mon, 19 Jun 2006 12:25:20 +0000
Subject: [PATCH] - bug fix: hang in auto resolve with big group of enemies

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@261 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 GameVersion.cpp            | 2 +-
 Strategic/Auto Resolve.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/GameVersion.cpp b/GameVersion.cpp
index f68e2e1b6..7e08a352f 100644
--- a/GameVersion.cpp
+++ b/GameVersion.cpp
@@ -23,7 +23,7 @@ INT16		zVersionLabel[256]		= { L"Beta v. 0.98" };
 #else
 
 	//RELEASE BUILD VERSION 
-	INT16		zVersionLabel[256]		= { L"Release v1.13.254" };
+	INT16		zVersionLabel[256]		= { L"Release v1.13.261" };
 
 
 #endif
diff --git a/Strategic/Auto Resolve.cpp b/Strategic/Auto Resolve.cpp
index 125a7ca72..b6047a2e6 100644
--- a/Strategic/Auto Resolve.cpp	
+++ b/Strategic/Auto Resolve.cpp	
@@ -4721,7 +4721,7 @@ void ProcessBattleFrame()
 				iMercsLeft--;
 				while( !found )
 				{
-					iRandom = PreRandom( iMercs );
+					iRandom = Random( iMercs );
 					pAttacker = &gpMercs[ iRandom ];
 					if( !(pAttacker->uiFlags & CELL_PROCESSED ) )
 					{
@@ -4735,7 +4735,7 @@ void ProcessBattleFrame()
 				iCivsLeft--;
 				while( !found )
 				{
-					iRandom = PreRandom( iCivs );
+					iRandom = Random( iCivs );
 					pAttacker = &gpCivs[ iRandom ];
 					if( !(pAttacker->uiFlags & CELL_PROCESSED ) )
 					{
@@ -4749,7 +4749,7 @@ void ProcessBattleFrame()
 				iEnemiesLeft--;
 				while( !found )
 				{
-					iRandom = PreRandom( iEnemies );
+					iRandom = Random( iEnemies );
 					pAttacker = &gpEnemies[ iRandom ];
 					if( !(pAttacker->uiFlags & CELL_PROCESSED ) )
 					{