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

Fixing cppcheck issue and compiler warning.

Browse Source
This commit is contained in:
lotodore
2011-02-28 18:29:57 +00:00
parent b78dc5af75
commit 2cd2ac57ca
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/common/avatarmanager.cpp
+1 -1
View File
@@ -166,7 +166,7 @@ AvatarManager::ChunkReadAvatarFile(boost::shared_ptr<AvatarFileState> fileState,
try { try {
if (!fileState->inputStream.fail() && !fileState->inputStream.eof()) { if (!fileState->inputStream.fail() && !fileState->inputStream.eof()) {
fileState->inputStream.read((char *)data, chunkSize); fileState->inputStream.read((char *)data, chunkSize);
retVal = fileState->inputStream.gcount(); retVal = static_cast<unsigned>(fileState->inputStream.gcount());
} }
} catch (...) { } catch (...) {
LOG_ERROR("Exception caught when trying to read avatar."); LOG_ERROR("Exception caught when trying to read avatar.");
src/engine/local_engine/localboard.cpp
+3 -3
View File
@@ -355,10 +355,10 @@ void LocalBoard::determinePlayerNeedToShowCards()
// break; // break;
// } // }
// } // }
for(level_it = level.begin(); level_it != level.end(); level_it++) { for(level_it = level.begin(); level_it != level.end(); ++level_it) {
if((*it_c)->getMyCardsValueInt() > (*level_it)[0]) { if((*it_c)->getMyCardsValueInt() > (*level_it)[0]) {
next_level_it = level_it; next_level_it = level_it;
next_level_it++; ++next_level_it;
if(next_level_it == level.end()) { if(next_level_it == level.end()) {
playerNeedToShowCards.push_back((*it_c)->getMyUniqueID()); playerNeedToShowCards.push_back((*it_c)->getMyUniqueID());
level_tmp = new int[2]; level_tmp = new int[2];
@@ -370,7 +370,7 @@ void LocalBoard::determinePlayerNeedToShowCards()
} else { } else {
if((*it_c)->getMyCardsValueInt() == (*level_it)[0]) { if((*it_c)->getMyCardsValueInt() == (*level_it)[0]) {
next_level_it = level_it; next_level_it = level_it;
next_level_it++; ++next_level_it;
// //
// for(level_it_tmp = level.begin(); level_it_tmp != level.end(); level_it_tmp++) { // for(level_it_tmp = level.begin(); level_it_tmp != level.end(); level_it_tmp++) {
// cout << (*level_it_tmp)[0] << "," << (*level_it_tmp)[1] << endl; // cout << (*level_it_tmp)[0] << "," << (*level_it_tmp)[1] << endl;