swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-07-14 00:01:30 -04:00
Code Issues Projects Releases Wiki Activity

and some more stragglers

Browse Source
This commit is contained in:
DarthArgus
2016-03-24 21:19:10 +00:00
parent 3b430656ba
commit 01cdf52bc0
5 changed files with 1 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/application/ChatServer/src/shared/ChatInterface.h
-81
View File
@@ -166,87 +166,6 @@ private:
std::map<unsigned, std::pair<std::pair<ChatUnicodeString, ChatUnicodeString>, int> > trackingRequestGetAnyAvatarForDestroy;
};
#if 0
//-----------------------------------------------------------------------
class ChatInterface : public ChatAPI
{
public:
ChatInterface (const std::string & strGameCode,
const std::string & strGatewayServerIP,
const unsigned short sGatewayServerPort,
const std::string & strBackupGatewayServerIP,
const unsigned short sBackupGatewayServerPort
);
virtual ~ChatInterface (); //lint !e1510 base class 'ChatAPI' has no destructor // jrandall - this is beyond my control
void checkRoomExpirations ();
void ConnectPlayer (const unsigned int suid, const std::string & characterName, const NetworkId & networkId);
void deferChatMessageFor (const NetworkId & id, const Archive::ByteStream & bs);
void destroyRoomByName (const std::string & roomName);
const std::hash_map<std::string, ChatServerRoomOwner> & getRoomList () const;
const ChatServerAvatarOwner *findAvatar(const ChatAvatarId & avatarId);
void leaveRoom (const ChatAvatarId & avatarId, const std::string & roomName);
//--- ChatAPI virtual overrides
virtual void OnConnectAvatar (const std::string & track, const unsigned int resultCode, const ChatAvatar & avatar);
virtual void OnAddFriend (const unsigned int sequence, const std::string & track, const unsigned int nResultCode, const ChatAvatar & requestingAvatar, const ChatAvatar & friendAvatar);
virtual void OnRemoveFriend (const unsigned int sequence, const std::string & track, const unsigned int nResultCode, const ChatAvatar & requestingAvatar, const ChatAvatar & friendAvatar);
virtual void OnAddIgnore (const unsigned int sequence, const std::string & track, const unsigned int nResultCode, const ChatAvatar & requestingAvatar, const ChatAvatar & ignoreAvatar);
virtual void OnRemoveIgnore (const unsigned int sequence, const std::string & track, const unsigned int nResultCode, const ChatAvatar & requestingAvatar, const ChatAvatar & ignoreAvatar);
virtual void OnAddRoomModerator (const unsigned int nSequenceID, const std::string & track, const unsigned int nResultCode, const ChatRoom & room, const unsigned int nRequestingAvatarUID, const ChatAvatar & moderator);
virtual void OnCreateRoom (const unsigned int sequence, const std::string & track, const unsigned int nResultCode, const ChatRoom & room);
virtual void OnDestroyRoom (const unsigned int nSequenceID, const std::string & track, const unsigned int nResultCode, const ChatRoom & room, const std::string & strCharacterName, const std::string & strGameServerName, const std::string & strGameCode);
virtual void OnDisconnectAvatar (const std::string & track, const unsigned int nResultCode, const ChatAvatar & toAvatar);
virtual void OnDisconnectAvatarNotify (const ChatAvatar & toAvatar);
virtual void OnEnterRoom (const unsigned int nSequenceID, const std::string & track, const unsigned int nResultCode, const ChatRoom & room, const ChatAvatar & avatar);
virtual void OnLeaveRoom (const unsigned int nSequenceID, const std::string & track, const unsigned int nResultCode, const ChatRoom & room, const ChatAvatar & avatar);
virtual void OnReceiveInstantMessage (const ChatAvatar & toAvatar, const ChatAvatar & fromAvatar, const Unicode::String & ustrMessage, const Unicode::String & oob);
virtual void OnReceivePersistentMessage (const unsigned int nSequenceID, const std::string & track, const unsigned int nResultCode, const ChatPersistentMessage & message);
virtual void OnReceivePersistentMessageHeader (const ChatPersistentMessageHeader & header);
virtual void OnReceivePersistentMessageHeaders (const unsigned int nSequenceID, const std::string & track, const unsigned int nResultCode, const ChatAvatar & toAvatar, const std::vector<ChatPersistentMessageHeader> & headers);
virtual void OnReceiveRoomMessage (const unsigned int nSequenceID, const ChatRoom & room, const std::string & strFromCharacterName, const std::string & strFromGameServerName, const std::string & strFromGameCode, const Unicode::String & ustrMessage, const Unicode::String & outOfBand, unsigned messageID);
virtual void OnConnect (const unsigned int resultCode);
virtual void OnReceiveRooms (const std::string & track, const unsigned int nResultCode, const std::vector<ChatRoom*> & rooms);
virtual void OnRemoveRoomModerator (const unsigned int nSequenceID, const std::string & track, const unsigned int nResultCode, const ChatRoom & room, const unsigned int nRequestingAvatarUID, const ChatAvatar & moderator);
virtual void OnSendInstantMessage (const unsigned int nSequenceID, const std::string & track, const unsigned int nResultCode, const ChatAvatar & sendingAvatar);
virtual void OnSendPersistentMessage (const unsigned int nSequenceID, const std::string & track, const unsigned int nResultCode, const ChatAvatar& sendingAvatar);
virtual void OnSendRoomMessage (const unsigned int sequence, const std::string & track, const unsigned int resultCode);
virtual void OnUpdateFriendStatus (const ChatAvatar & toAvatar, const ChatAvatar & fromAvatar, const bool bIsConnected);
virtual void OnReceiveRoomInvitation (const std::string & strRoomName, const ChatAvatar & invitorAvatar, const ChatAvatar & inviteeAvatar);
virtual void OnSendRoomInvitation (const unsigned int sequence, const std::string & track, const unsigned int resultCode, const ChatRoom & room, const bool isOnline, const ChatAvatar & invitor, const ChatAvatar & invitee);
const ChatServerRoomOwner * getRoomByName (const std::string & roomName) const;
void disconnectPlayer (const ChatAvatarId & avatarId);
void queryRoom (const NetworkId & id, ConnectionServerConnection * connection, const unsigned int sequenceId, const std::string & roomName);
void queryRoom (const NetworkId & id, ConnectionServerConnection * connection, const unsigned int sequenceId, const unsigned int roomId);
void requestRoomList (const NetworkId & id, ConnectionServerConnection * connection);
void sendMessageToAllAvatars (const GameNetworkMessage & message);
bool sendMessageToPendingAvatar(const ChatAvatarId &id, const GameNetworkMessage &message);
private:
void sendMessageToAvatar (const ChatAvatar & avatar, const GameNetworkMessage & message);
void sendMessageToAvatar (const ChatAvatarId & avatar, const GameNetworkMessage & message);
private:
ChatInterface & operator = (const ChatInterface & rhs);
ChatInterface(const ChatInterface & source);
std::hash_map<std::string, NetworkId> pendingAvatars;
std::hash_map<NetworkId, std::vector<Archive::ByteStream>, NetworkId::Hash > deferredChatMessages;
std::hash_map<std::string, ChatServerRoomOwner> roomList;
std::map<ChatAvatarId, ChatServerAvatarOwner *> avatarMap;
time_t lastRoomCheck;
}; //lint !e1712 default constructor not defined for class
#endif
std::string toLower(const std::string & source);
std::string toUpper(const std::string & source);
void makeRoomData(const ChatRoom & room, ChatRoomData & roomData);
engine/server/library/serverGame/src/shared/command/CommandCppFuncs.cpp
-20
View File
@@ -1463,26 +1463,6 @@ static void commandFuncAuctionAccept(Command const &, NetworkId const &actor, Ne
static void commandFuncAuctionQuery(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
{
#if 0
size_t pos = 0;
NetworkId auctionContainerId(nextOidParm(params, pos));
int requestId = nextIntParm(params, pos);
int type = nextIntParm(params, pos);
int category = nextIntParm(params, pos);
CreatureObject *actorCreature = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
ServerObject *auctionContainer = dynamic_cast<ServerObject *>(NetworkIdManager::getObjectById(auctionContainerId));
if (actorCreature && auctionContainer)
{
CommoditiesMarket::auctionQuery(
*actorCreature,
requestId,
type,
category,
*auctionContainer);
}
#endif
}
// ----------------------------------------------------------------------
engine/shared/library/sharedFoundation/src/shared/CommandLine.h
-10
View File
@@ -110,16 +110,6 @@ public:
int int2;
char char1;
const char *charp1;
#if 0
// if this node's parent is branch head, this variable is ignored.
// if this node's parent is list head, if node is required, at least one instance of this node must be present.
bool nodeRequired;
// if this node is a list head, this variable is ignored.
// if this node is a branch head, false = 0 or 1 child may be present, true = one child must be present.
bool childrenRequired;
#endif
};
enum ArgumentPolicy
engine/shared/library/sharedObject/src/shared/portal/PortalProperty.cpp
-20
View File
@@ -524,26 +524,6 @@ const CellProperty *PortalProperty::getCell(int index) const
// ----------------------------------------------------------------------
#if 0
int PortalProperty::getNumberOfLights(int cellIndex) const
{
DEBUG_FATAL(cellIndex < 0 || cellIndex >= static_cast<int>(m_cellList->size()), ("cell index out of range"));
return (*m_cellDataList)[cellIndex]->getNumberOfLights();
}
// ----------------------------------------------------------------------
const PortalProperty::LightData &PortalProperty::getLightData(int cellIndex, int lightIndex) const
{
DEBUG_FATAL(cellIndex < 0 || cellIndex >= static_cast<int>(m_cellList->size()), ("cell index out of range"));
return (*m_cellDataList)[cellIndex]->getLightData(lightIndex);
}
#endif
// ----------------------------------------------------------------------
const PortalProperty::CellNameList &PortalProperty::getCellNames() const
{
return m_template->getCellNames();
game/server/application/SwgDatabaseServer/src/shared/buffers/ObjectTableBuffer.cpp
+1 -5
View File
@@ -253,11 +253,7 @@ bool ObjectTableBuffer::save(DB::Session *session)
++deletes;
if (getMode()==DB::ModeQuery::mode_INSERT && !i->second->deleted.isNull() && i->second->deleted.getValue()!=0)
{
// DEBUG_REPORT_LOG(true,("Skipped saving deleted object %s\n",i->second->object_id.getValue().getValueString().c_str()));
}
else
if (!(getMode()==DB::ModeQuery::mode_INSERT && !i->second->deleted.isNull() && i->second->deleted.getValue()!=0))
{
++updates;
qry.setData(*(i->second));