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

Fixing more cppcheck issues.

Browse Source
This commit is contained in:
lotodore
2011-02-08 12:10:39 +00:00
parent f9bbd9199f
commit f4eb7221e3
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/common/avatarmanager.cpp
+2 -2
View File
@@ -107,7 +107,7 @@ AvatarManager::AddSingleAvatar(const std::string &fileName)
if (!fileName.empty() && !tmpFileName.empty()) if (!fileName.empty() && !tmpFileName.empty())
{ {
unsigned outFileSize; unsigned outFileSize = 0;
AvatarFileType outFileType; AvatarFileType outFileType;
boost::shared_ptr<AvatarFileState> tmpFileState = OpenAvatarFileForChunkRead(tmpFileName, outFileSize, outFileType); boost::shared_ptr<AvatarFileState> tmpFileState = OpenAvatarFileForChunkRead(tmpFileName, outFileSize, outFileType);
@@ -192,7 +192,7 @@ int
AvatarManager::AvatarFileToNetPackets(const string &fileName, unsigned requestId, NetPacketList &packets) AvatarManager::AvatarFileToNetPackets(const string &fileName, unsigned requestId, NetPacketList &packets)
{ {
int retVal = ERR_NET_INVALID_AVATAR_FILE; int retVal = ERR_NET_INVALID_AVATAR_FILE;
unsigned fileSize; unsigned fileSize = 0;
AvatarFileType fileType; AvatarFileType fileType;
boost::shared_ptr<AvatarFileState> tmpState = OpenAvatarFileForChunkRead(fileName, fileSize, fileType); boost::shared_ptr<AvatarFileState> tmpState = OpenAvatarFileForChunkRead(fileName, fileSize, fileType);
if (tmpState.get() && fileSize && fileType != AVATAR_FILE_TYPE_UNKNOWN) if (tmpState.get() && fileSize && fileType != AVATAR_FILE_TYPE_UNKNOWN)
src/engine/local_engine/localboard.cpp
+1 -1
View File
@@ -27,7 +27,7 @@
using namespace std; using namespace std;
LocalBoard::LocalBoard(unsigned dp) : BoardInterface(), pot(0), sets(0), dealerPosition(dp), allInCondition(false) LocalBoard::LocalBoard(unsigned dp) : BoardInterface(), pot(0), sets(0), dealerPosition(dp), allInCondition(false), lastActionPlayer(0)
{ {
myCards[0] = myCards[1] = myCards[2] = myCards[3] = myCards[4] = 0; myCards[0] = myCards[1] = myCards[2] = myCards[3] = myCards[4] = 0;
} }
src/engine/network_engine/clientboard.cpp
+1 -1
View File
@@ -24,7 +24,7 @@
using namespace std; using namespace std;
ClientBoard::ClientBoard(unsigned dp) ClientBoard::ClientBoard(unsigned dp)
: pot(0), sets(0), dealerPosition(dp) : pot(0), sets(0), dealerPosition(dp), allInCondition(false), lastActionPlayer(0)
{ {
myCards[0] = myCards[1] = myCards[2] = myCards[3] = myCards[4] = 0; myCards[0] = myCards[1] = myCards[2] = myCards[3] = myCards[4] = 0;
} }
src/playerdata.cpp
+4 -3
View File
@@ -27,9 +27,10 @@ PlayerData::PlayerData(unsigned uniqueId, int number, PlayerType type, PlayerRig
} }
PlayerData::PlayerData(const PlayerData &other) PlayerData::PlayerData(const PlayerData &other)
: m_uniqueId(other.GetUniqueId()), m_number(other.GetNumber()), m_name(other.GetName()), : m_uniqueId(other.GetUniqueId()), m_dbId(other.GetDBId()), m_number(other.GetNumber()), m_name(other.GetName()),
m_avatarFile(other.GetAvatarFile()), m_type(other.GetType()), m_rights(other.GetRights()), m_password(), m_country(other.GetCountry()), m_avatarFile(other.GetAvatarFile()), m_avatarMD5(other.GetAvatarMD5()),
m_isGameAdmin(other.IsGameAdmin()), m_netSessionData(other.GetNetSessionData()) m_type(other.GetType()), m_rights(other.GetRights()), m_isGameAdmin(other.IsGameAdmin()),
m_netSessionData(other.GetNetSessionData()), m_netAvatarFile()
{ {
} }