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

Making cppcheck happy.

Browse Source
This commit is contained in:
lotodore
2011-12-23 17:14:36 +00:00
parent ae842b9a2d
commit 25ed93f477
2 changed files with 2 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/local_engine/tools.cpp
-79
View File
@@ -92,82 +92,3 @@ void Tools::GetRandUnique(int minValue, int maxValue, unsigned count, int *out)
}
}
/*
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];
unsigned int randNumber;
int i;
if (!different) {
int counter(0);
while(counter < howMany) {
#ifdef HAVE_OPENSSL
if(!RAND_bytes(rand_buf, 4)) {
LOG_MSG("RAND_bytes failed!");
}
#else
gcry_randomize(rand_buf, 4, GCRY_VERY_STRONG_RANDOM);
#endif
randNumber = 0;
for(i=0; i<4; i++) {
randNumber += (rand_buf[i] << 8*i);
}
if(randNumber < ( (unsigned int) ( ((double)numeric_limits<unsigned int>::max()) / r ) ) * r) {
randArray[counter] = start + (randNumber % r);
counter++;
}
}
} else {
int *tempArray = new int[end-start+1];
for (i=0; i<(end-start+1); i++) tempArray[i]=1;
if(bad) {
for(i=0; i<countBad; i++) {
tempArray[bad[i]]=0;
}
}
int counter(0);
while (counter < howMany) {
#ifdef HAVE_OPENSSL
if(!RAND_bytes(rand_buf, 4)) {
LOG_MSG("RAND_bytes failed!");
}
#else
gcry_randomize(rand_buf, 4, GCRY_VERY_STRONG_RANDOM);
#endif
randNumber = 0;
for(i=0; i<4; i++) {
randNumber += (rand_buf[i] << 8*i);
}
if(randNumber < ( (unsigned int) ( ((double)numeric_limits<unsigned int>::max()) / r ) ) * r) {
randNumber = randNumber % r;
if (tempArray[randNumber] == 1) {
randArray[counter] = start + randNumber;
tempArray[randNumber] = 0;
counter++;
}
}
}
delete[] tempArray;
}
}*/
src/net/common/clientthread.cpp
+2 -2
View File
@@ -1102,8 +1102,8 @@ ClientThread::MapPlayerDataList()
while (i != end) {
boost::shared_ptr<PlayerData> tmpData(new PlayerData(*(*i)));
int numberDiff = GetStartData().numberOfPlayers - m_origGuiPlayerNum;
tmpData->SetNumber((tmpData->GetNumber() + numberDiff) % GetStartData().numberOfPlayers);
int numberDiff = numPlayers - m_origGuiPlayerNum;
tmpData->SetNumber((tmpData->GetNumber() + numberDiff) % numPlayers);
mappedList.push_back(tmpData);
++i;
}