From 9df9b8eedefef7da9d963e3a02cd5375391ad59e Mon Sep 17 00:00:00 2001 From: lotodore Date: Fri, 19 Jan 2007 23:23:25 +0000 Subject: [PATCH] Removed C99 dynamic arrays for MSVC compatibility. --- src/engine/local_engine/localhand.cpp | 5 +++-- src/engine/local_engine/localriver.cpp | 7 ++++--- src/engine/local_engine/tools.cpp | 3 ++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/engine/local_engine/localhand.cpp b/src/engine/local_engine/localhand.cpp index 3bad0e5d..6c75dc53 100755 --- a/src/engine/local_engine/localhand.cpp +++ b/src/engine/local_engine/localhand.cpp @@ -46,7 +46,7 @@ LocalHand::LocalHand(EngineFactory *f, GuiInterface *g, BoardInterface *b, Playe // Karten generieren und Board sowie Player zuweisen Tools myTool; - int cardsArray[2*actualQuantityPlayers+5]; + int *cardsArray = new int[2*actualQuantityPlayers+5]; myTool.getRandNumber(0, 51, 2*actualQuantityPlayers+5, cardsArray, 1); int tempBoardArray[5]; int tempPlayerArray[2]; @@ -78,7 +78,8 @@ LocalHand::LocalHand(EngineFactory *f, GuiInterface *g, BoardInterface *b, Playe //Rundenwechsel | beim ersten Durchlauf --> Preflop starten myGui->nextPlayerAnimation(); - + + delete[] cardsArray; } diff --git a/src/engine/local_engine/localriver.cpp b/src/engine/local_engine/localriver.cpp index 992d18f9..801b8702 100755 --- a/src/engine/local_engine/localriver.cpp +++ b/src/engine/local_engine/localriver.cpp @@ -182,7 +182,7 @@ void LocalRiver::distributePot() { int winnersCounter = 0; // dieses Array ermittelt wieviel jeder Spieler wᅵrend der gesamten BettingRound gesetzt hat - int roundSetArray[myHand->getGuiInterface()->getMaxQuantityPlayers()]; + int *roundSetArray = new int[myHand->getGuiInterface()->getMaxQuantityPlayers()]; for(i=0; igetGuiInterface()->getMaxQuantityPlayers(); i++) { // Standardwert fr nicht mehr aktive roundSetArray[i] = 0; @@ -193,7 +193,7 @@ void LocalRiver::distributePot() { } // hier steht der CardsValue der Spieler drin die an der Potverteilung teilnehmen (d.h. aktiv und nicht gefoldet), bei allen anderen steht ne 0 - int cardsValueArray[myHand->getGuiInterface()->getMaxQuantityPlayers()]; + int *cardsValueArray = new int[myHand->getGuiInterface()->getMaxQuantityPlayers()]; int playerWantsPotCounter = 0; for(i=0; igetGuiInterface()->getMaxQuantityPlayers(); i++) { @@ -421,5 +421,6 @@ void LocalRiver::distributePot() { if(myHand->getBoard()->getPot() != 0) cout << "!!! Pot: " << myHand->getBoard()->getPot() << endl; delete[] winnersArray; - + delete[] roundSetArray; + delete[] cardsValueArray; } diff --git a/src/engine/local_engine/tools.cpp b/src/engine/local_engine/tools.cpp index a26ab1e0..37a8f09d 100755 --- a/src/engine/local_engine/tools.cpp +++ b/src/engine/local_engine/tools.cpp @@ -47,7 +47,7 @@ void Tools::getRandNumber(int start, int end, int howMany, int* randArray, bool else { - int tempArray[end-start]; + int *tempArray = new int[end-start]; int i; for (i=0; i<(end-start); i++) tempArray[i]=1; @@ -67,6 +67,7 @@ void Tools::getRandNumber(int start, int end, int howMany, int* randArray, bool } + delete[] tempArray; } }