fix a few discrepancies

This commit is contained in:
DarthArgus
2016-07-25 01:46:39 +00:00
parent d2c830306f
commit 5084c72fbe
3 changed files with 6 additions and 7 deletions
@@ -133,7 +133,7 @@ template <class DataType, class ReturnType>
inline TemplateBase<DataType, ReturnType>::TemplateBase(void) :
m_dataType(NONE),
m_loaded(false),
m_data(nullptr)
m_data()
{
} // TemplateBase::TemplateBase(void)
@@ -2115,12 +2115,12 @@ namespace ChatSystem
ChatAvatar *destAvatar = M.getDestAvatar()->getNewChatAvatar();
ChatAvatar *srcAvatar = M.getSrcAvatar()->getNewChatAvatar();
if (destRoomCore && !destRoomCore->addBan(M.getDestAvatar()))
if (destRoomCore && (!destRoomCore->addBan(M.getDestAvatar())))
{
delete M.getSrcAvatar();
}
if (destRoomCore && !destRoomCore || !destRoom)
if (destRoomCore && (!destRoomCore || !destRoom))
{
_chatdebug_("ChatAPI:BadData: MESSAGE_ADDBANAVATAR: destRoom=%p, destRoomCore=%p\n", destRoom, destRoomCore);
delete srcAvatar;
@@ -3357,4 +3357,4 @@ namespace ChatSystem
return returnVal;
}
};
};
@@ -1162,8 +1162,7 @@ namespace ChatSystem
m_srcAvatarID(srcAvatarID),
m_listLength(0),
m_headers(nullptr),
m_cores(nullptr),
m_listLength(0)
m_cores(nullptr)
{
}
@@ -1610,4 +1609,4 @@ namespace ChatSystem
get(iter, m_track);
get(iter, m_result);
}
}; // end namespace
}; // end namespace