mirror of
https://github.com/SWG-Source/src.git
synced 2026-07-28 22:15:49 -04:00
fix all the warnings
This commit is contained in:
@@ -100,11 +100,11 @@ namespace ChatServerNamespace
|
||||
|
||||
if(fullName.find(ConfigChatServer::getClusterName()) == std::string::npos)
|
||||
{
|
||||
fullName = ConfigChatServer::getClusterName() + '+' + fullName;
|
||||
fullName = std::string(ConfigChatServer::getClusterName()) + std::string("+") + fullName;
|
||||
}
|
||||
if(fullName.find(ConfigChatServer::getGameCode()) == std::string::npos)
|
||||
{
|
||||
fullName = ConfigChatServer::getGameCode() + '+' + fullName;
|
||||
fullName = std::string(ConfigChatServer::getGameCode()) + std::string("+") + fullName;
|
||||
}
|
||||
if(fullName.find("SOE") == std::string::npos)
|
||||
{
|
||||
@@ -122,7 +122,7 @@ namespace ChatServerNamespace
|
||||
std::set<NetworkId> s_notSubscribedClients;
|
||||
|
||||
// Control log output for chat room related methods
|
||||
bool const s_enableChatRoomLogs = false;
|
||||
bool const s_enableChatRoomLogs = false; // make configurable?
|
||||
}
|
||||
|
||||
using namespace ChatServerNamespace;
|
||||
|
||||
+3
-3
@@ -124,7 +124,7 @@ Object * ServerTangibleObjectTemplate::createObject(void) const
|
||||
} // ServerTangibleObjectTemplate::createObject
|
||||
|
||||
//@BEGIN TFD
|
||||
const TriggerVolumeData & ServerTangibleObjectTemplate::getTriggerVolumes(int index) const
|
||||
const TriggerVolumeData ServerTangibleObjectTemplate::getTriggerVolumes(int index) const
|
||||
{
|
||||
const ServerTangibleObjectTemplate * base = nullptr;
|
||||
if (m_baseData != nullptr)
|
||||
@@ -155,8 +155,8 @@ const TriggerVolumeData & ServerTangibleObjectTemplate::getTriggerVolumes(int in
|
||||
}
|
||||
|
||||
DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_triggerVolumes.size(), ("template param index out of range"));
|
||||
const TriggerVolumeData & value = m_triggerVolumes[index]->getValue();
|
||||
return value;
|
||||
|
||||
return m_triggerVolumes[index]->getValue();
|
||||
} // ServerTangibleObjectTemplate::getTriggerVolumes
|
||||
|
||||
size_t ServerTangibleObjectTemplate::getTriggerVolumesCount(void) const
|
||||
|
||||
+1
-1
@@ -87,7 +87,7 @@ public:
|
||||
};
|
||||
|
||||
public:
|
||||
const TriggerVolumeData & getTriggerVolumes(int index) const;
|
||||
const TriggerVolumeData getTriggerVolumes(int index) const;
|
||||
size_t getTriggerVolumesCount(void) const;
|
||||
CombatSkeleton getCombatSkeleton(bool testData = false) const;
|
||||
int getMaxHitPoints(bool testData = false) const;
|
||||
|
||||
-2
@@ -221,8 +221,6 @@ namespace soe
|
||||
return bytes;
|
||||
}
|
||||
|
||||
operator stringVector_t () { return *this; }
|
||||
|
||||
//unsigned Read(const unsigned char * stream, unsigned size);
|
||||
//DECLARE_SCRIBE_MEMBERS
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user