From 1c5e5767da5ecfd221cca59bf41f58d9367c4404 Mon Sep 17 00:00:00 2001
From: floty <f.thauer@web.de>
Date: Mon, 20 Oct 2008 09:25:45 +0000
Subject: [PATCH] - exclude bad numbers in getRandNumber (tools.cpp) - delete
 warnings in localplayer

---
 src/engine/local_engine/localplayer.cpp | 6 +++---
 src/engine/local_engine/tools.cpp       | 4 ++--
 src/engine/local_engine/tools.h         | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/engine/local_engine/localplayer.cpp b/src/engine/local_engine/localplayer.cpp
index 8a146fac..97da4d51 100755
--- a/src/engine/local_engine/localplayer.cpp
+++ b/src/engine/local_engine/localplayer.cpp
@@ -4074,7 +4074,7 @@ void LocalPlayer::preflopEngine3() {
 		}
 		else {
 			// RAISE --> wenn hohes Potential
-			if(potential >= 4 && 6 * currentHand->getSmallBlind() >= currentHand->getCurrentBeRo()->getHighestSet() || bluff <= 6) {
+			if((potential >= 4 && 6 * currentHand->getSmallBlind() >= currentHand->getCurrentBeRo()->getHighestSet()) || bluff <= 6) {
 				// extrem hohes Potential --> groï¿œr Raise
 				if(potential>=6 || bluff <= 2) {
 	
@@ -4509,7 +4509,7 @@ void LocalPlayer::turnEngine3() {
 			// CALL und RAISE --> wenn bereits gesetzt wurde
 			else {	
 				// RAISE --> wenn Potential besonders gut
-				if(potential >=4 && 2 * tempFold * currentHand->getSmallBlind() >= currentHand->getCurrentBeRo()->getHighestSet() || (bluff <= 4 && 3 * tempFold * currentHand->getSmallBlind() >= currentHand->getCurrentBeRo()->getHighestSet())) {
+				if((potential >=4 && 2 * tempFold * currentHand->getSmallBlind() >= currentHand->getCurrentBeRo()->getHighestSet()) || (bluff <= 4 && 3 * tempFold * currentHand->getSmallBlind() >= currentHand->getCurrentBeRo()->getHighestSet())) {
 	
 					// bluff - raise
 					if(bluff <= 4) raise = ((bluff+1)/2) * currentHand->getCurrentBeRo()->getHighestSet();
@@ -4671,7 +4671,7 @@ void LocalPlayer::riverEngine3() {
 			// CALL und RAISE --> wenn bereits gesetzt wurde
 			else {	
 				// RAISE --> wenn Potential besonders gut
-				if(potential >=4 && 2 * tempFold * currentHand->getSmallBlind() >= currentHand->getCurrentBeRo()->getHighestSet() || (bluff <= 2 && 4 * tempFold * currentHand->getSmallBlind() >= currentHand->getCurrentBeRo()->getHighestSet())) {
+				if((potential >=4 && 2 * tempFold * currentHand->getSmallBlind() >= currentHand->getCurrentBeRo()->getHighestSet()) || (bluff <= 2 && 4 * tempFold * currentHand->getSmallBlind() >= currentHand->getCurrentBeRo()->getHighestSet())) {
 	
 					// bluff - raise
 					if(bluff <= 2 ) raise = bluff * currentHand->getCurrentBeRo()->getHighestSet();
diff --git a/src/engine/local_engine/tools.cpp b/src/engine/local_engine/tools.cpp
index 87b69545..5be0a825 100755
--- a/src/engine/local_engine/tools.cpp
+++ b/src/engine/local_engine/tools.cpp
@@ -27,7 +27,7 @@
 
 using namespace std;
 
-void Tools::getRandNumber(int start, int end, int howMany, int* randArray, bool different, int* bad) {
+void Tools::getRandNumber(int start, int end, int howMany, int* randArray, bool different, int* bad, int countBad) {
 
 	int r = end-start+1;
 	unsigned char rand_buf[4];
@@ -61,7 +61,7 @@ void Tools::getRandNumber(int start, int end, int howMany, int* randArray, bool
 		for (i=0; i<(end-start+1); i++) tempArray[i]=1;
 
 		if(bad) {
-			for(i=0;i<(int)(sizeof(bad)/sizeof(int));i++) {
+			for(i=0;i<countBad;i++) {
 				tempArray[bad[i]]=0;
 			}
 		}
diff --git a/src/engine/local_engine/tools.h b/src/engine/local_engine/tools.h
index fe0d2562..1357ce08 100755
--- a/src/engine/local_engine/tools.h
+++ b/src/engine/local_engine/tools.h
@@ -22,7 +22,7 @@
 
 class Tools{
 public:
-	static void getRandNumber(int, int, int, int*, bool, int* = 0);
+	static void getRandNumber(int, int, int, int*, bool, int* = 0, int = 0);
 
 };