sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
doitux
2012-11-27 00:53:51 +01:00
parent e76ecc8fc6 d48c9f59c7
commit b84888b61c
5 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/common/crypthelper.cpp
+2 -3
View File
@@ -271,8 +271,7 @@ CryptHelper::AES128Encrypt(const unsigned char *keyData, unsigned keySize, const
BytesToKey(keyData, keySize, key, iv); BytesToKey(keyData, keySize, key, iv);
// Add padding to plain data. // Add padding to plain data.
unsigned paddedPlainSize = ADD_PADDING(plainSize); unsigned paddedPlainSize = ADD_PADDING(plainSize);
unsigned char *paddedPlainStr = new unsigned char[ADD_PADDING(plainSize)]; unsigned char *paddedPlainStr = (unsigned char *)calloc(paddedPlainSize, 1);
memset(paddedPlainStr, 0, paddedPlainSize);
memcpy(paddedPlainStr, plainStr.c_str(), plainSize); memcpy(paddedPlainStr, plainStr.c_str(), plainSize);
// Perform the encryption. // Perform the encryption.
int cipherSize = paddedPlainSize; int cipherSize = paddedPlainSize;
@@ -311,7 +310,7 @@ CryptHelper::AES128Encrypt(const unsigned char *keyData, unsigned keySize, const
gcry_cipher_close(hd); gcry_cipher_close(hd);
#endif #endif
delete[] paddedPlainStr; free(paddedPlainStr);
} }
return retVal; return retVal;
} }
src/engine/local_engine/localbero.cpp
+2 -1
View File
@@ -96,9 +96,10 @@ void LocalBeRo::run()
PlayerListIterator it_1, it_2; PlayerListIterator it_1, it_2;
if(myHand->getActivePlayerList()->size() > 2) {
// running player before smallBlind // running player before smallBlind
bool formerRunningPlayerFound = false; bool formerRunningPlayerFound = false;
if(myHand->getActivePlayerList()->size() > 2) {
it_1 = myHand->getActivePlayerIt(smallBlindPositionId); it_1 = myHand->getActivePlayerIt(smallBlindPositionId);
if(it_1 == myHand->getActivePlayerList()->end()) { if(it_1 == myHand->getActivePlayerList()->end()) {
src/gui/qt/gametable/gametableimpl.cpp
+2 -5
View File
@@ -2023,11 +2023,9 @@ void gameTableImpl::myCheck()
int gameTableImpl::getMyCallAmount() int gameTableImpl::getMyCallAmount()
{ {
int tempHighestSet = 0;
boost::shared_ptr<HandInterface> currentHand = myStartWindow->getSession()->getCurrentGame()->getCurrentHand(); boost::shared_ptr<HandInterface> currentHand = myStartWindow->getSession()->getCurrentGame()->getCurrentHand();
boost::shared_ptr<PlayerInterface> humanPlayer = currentHand->getSeatsList()->front(); boost::shared_ptr<PlayerInterface> humanPlayer = currentHand->getSeatsList()->front();
tempHighestSet = currentHand->getCurrentBeRo()->getHighestSet(); int tempHighestSet = currentHand->getCurrentBeRo()->getHighestSet();
if (humanPlayer->getMyCash() + humanPlayer->getMySet() <= tempHighestSet) { if (humanPlayer->getMyCash() + humanPlayer->getMySet() <= tempHighestSet) {
@@ -2065,11 +2063,10 @@ int gameTableImpl::getMyBetAmount()
void gameTableImpl::myCall() void gameTableImpl::myCall()
{ {
int tempHighestSet = 0;
boost::shared_ptr<HandInterface> currentHand = myStartWindow->getSession()->getCurrentGame()->getCurrentHand(); boost::shared_ptr<HandInterface> currentHand = myStartWindow->getSession()->getCurrentGame()->getCurrentHand();
boost::shared_ptr<PlayerInterface> humanPlayer = currentHand->getSeatsList()->front(); boost::shared_ptr<PlayerInterface> humanPlayer = currentHand->getSeatsList()->front();
tempHighestSet = currentHand->getCurrentBeRo()->getHighestSet(); int tempHighestSet = currentHand->getCurrentBeRo()->getHighestSet();
if (humanPlayer->getMyCash() + humanPlayer->getMySet() <= tempHighestSet) { if (humanPlayer->getMyCash() + humanPlayer->getMySet() <= tempHighestSet) {
src/gui/qt/sound/soundevents.h
+5
View File
@@ -15,6 +15,11 @@ public:
void newGameStarts(); void newGameStarts();
void playSound(std::string audioString, int playerID); void playSound(std::string audioString, int playerID);
protected:
// Prevent copy construction.
// This is only a declaration.
SoundEvents(const SoundEvents &);
private: private:
SDLPlayer *mySDLPlayer; SDLPlayer *mySDLPlayer;
ConfigFile *myConfig; ConfigFile *myConfig;
win_create_release.sh
+2 -2
View File
@@ -9,9 +9,9 @@ if [[ -n "$1" && -n "$2" ]] ; then
find ./PokerTH-$1/ -name ".svn" | xargs rm -Rf find ./PokerTH-$1/ -name ".svn" | xargs rm -Rf
zip -r PokerTH-$1-windows.zip ./PokerTH-$1 zip -r PokerTH-$1-windows.zip ./PokerTH-$1
~/bitrock-installbuilder/installbuilder-7.2.5/bin/builder build ~/slave/pokerth-release-win32/build/pokerth_bitrock_windows.xml windows ~/bitrock-installbuilder/bin/builder build ~/slave/pokerth-release-win32/build/pokerth_bitrock_windows.xml windows
mv ~/bitrock-installbuilder/installbuilder-7.2.5/output/PokerTH-$1-windows-installer.exe . mv ~/bitrock-installbuilder/output/PokerTH-$1-windows-installer.exe .
scp PokerTH-$1-windows-installer.exe PokerTH-$1-windows.zip lotodore,pokerth@frs.sourceforge.net:/home/frs/project/p/po/pokerth/pokerth/$2/ scp PokerTH-$1-windows-installer.exe PokerTH-$1-windows.zip lotodore,pokerth@frs.sourceforge.net:/home/frs/project/p/po/pokerth/pokerth/$2/
md5sum PokerTH-$1-windows-installer.exe md5sum PokerTH-$1-windows-installer.exe
rm PokerTH-$1-windows-installer.exe rm PokerTH-$1-windows-installer.exe