From 48124f21f48e83ca45ba7c9f367057182d477c51 Mon Sep 17 00:00:00 2001 From: floty Date: Fri, 17 Oct 2008 11:22:14 +0000 Subject: [PATCH] --- src/engine/local_engine/arraydata.cpp | 5 ++++- src/engine/local_engine/arraydata.h | 2 ++ src/engine/local_engine/cardsvalue.cpp | 16 ++++++++++------ src/engine/local_engine/cardsvalue.h | 1 + 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/engine/local_engine/arraydata.cpp b/src/engine/local_engine/arraydata.cpp index 4363ef5b..aa28b707 100644 --- a/src/engine/local_engine/arraydata.cpp +++ b/src/engine/local_engine/arraydata.cpp @@ -1031,8 +1031,11 @@ ArrayData::~ArrayData() void ArrayData::getHandChancePreflop(int handCode, int** values) { + int check = -1; + for (unsigned val = 0; val < NUM_HAND_CHANCE_PREFLOP; val++) { if(handCode == handChancePreflop[val].hand) { + check = 1; for(int i=0;i<10;i++) { for(int j=0;j<2;j++) { values[i][j] = handChancePreflop[val].data[i][j]; @@ -1041,6 +1044,6 @@ void ArrayData::getHandChancePreflop(int handCode, int** values) { break; } } -// if (myOdds == -1) LOG_ERROR(__FILE__ << " (" << __LINE__ << "): ERROR myOdds - " << handCode); + if (check == -1) LOG_ERROR(__FILE__ << " (" << __LINE__ << "): ERROR getHandChancePreflop - " << handCode); } diff --git a/src/engine/local_engine/arraydata.h b/src/engine/local_engine/arraydata.h index dfd381c1..169b8d80 100644 --- a/src/engine/local_engine/arraydata.h +++ b/src/engine/local_engine/arraydata.h @@ -20,6 +20,8 @@ #ifndef ARRAYDATA_H #define ARRAYDATA_H +#include + class ArrayData{ public: ArrayData(); diff --git a/src/engine/local_engine/cardsvalue.cpp b/src/engine/local_engine/cardsvalue.cpp index dfc239a7..0691c198 100755 --- a/src/engine/local_engine/cardsvalue.cpp +++ b/src/engine/local_engine/cardsvalue.cpp @@ -572,7 +572,10 @@ int** CardsValue::calcCardsChance(GameState beRoID, int* playerCards, int* board int sum = 0; for(i=0;i<10;i++) { - for(j=0;j<2;j++) hand[i][j] = 0; + hand[i] = new int[2]; + for(j=0;j<2;j++) { + hand[i][j] = 0; + } } cards[0] = playerCards[0]; @@ -583,11 +586,12 @@ int** CardsValue::calcCardsChance(GameState beRoID, int* playerCards, int* board switch(beRoID) { case GAME_STATE_PREFLOP: { -// int rand[5]; -// for(i=0;igetHandChancePreflop(holeCardsToIntCode(playerCards),hand); + + delete myArrayData; + } break; case GAME_STATE_FLOP: { diff --git a/src/engine/local_engine/cardsvalue.h b/src/engine/local_engine/cardsvalue.h index 8e892bce..f041085c 100755 --- a/src/engine/local_engine/cardsvalue.h +++ b/src/engine/local_engine/cardsvalue.h @@ -21,6 +21,7 @@ #define CARDSVALUE_H #include "game_defs.h" +#include "arraydata.h" class CardsValue{ public: