diff --git a/engine/server/application/ChatServer/src/shared/ChatInterface.h b/engine/server/application/ChatServer/src/shared/ChatInterface.h index a42a6ecf..31c3bed6 100755 --- a/engine/server/application/ChatServer/src/shared/ChatInterface.h +++ b/engine/server/application/ChatServer/src/shared/ChatInterface.h @@ -166,87 +166,6 @@ private: std::map, 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 & 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 & 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 & 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 pendingAvatars; - std::hash_map, NetworkId::Hash > deferredChatMessages; - std::hash_map roomList; - std::map 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); diff --git a/engine/server/library/serverGame/src/shared/command/CommandCppFuncs.cpp b/engine/server/library/serverGame/src/shared/command/CommandCppFuncs.cpp index f39fcae2..0478a3d6 100755 --- a/engine/server/library/serverGame/src/shared/command/CommandCppFuncs.cpp +++ b/engine/server/library/serverGame/src/shared/command/CommandCppFuncs.cpp @@ -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 ¶ms) { -#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(NetworkIdManager::getObjectById(actor)); - ServerObject *auctionContainer = dynamic_cast(NetworkIdManager::getObjectById(auctionContainerId)); - - if (actorCreature && auctionContainer) - { - CommoditiesMarket::auctionQuery( - *actorCreature, - requestId, - type, - category, - *auctionContainer); - } -#endif } // ---------------------------------------------------------------------- diff --git a/engine/shared/library/sharedFoundation/src/shared/CommandLine.h b/engine/shared/library/sharedFoundation/src/shared/CommandLine.h index d4eab6a0..04b4d10d 100755 --- a/engine/shared/library/sharedFoundation/src/shared/CommandLine.h +++ b/engine/shared/library/sharedFoundation/src/shared/CommandLine.h @@ -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 diff --git a/engine/shared/library/sharedObject/src/shared/portal/PortalProperty.cpp b/engine/shared/library/sharedObject/src/shared/portal/PortalProperty.cpp index 4dce02ea..a24d131b 100755 --- a/engine/shared/library/sharedObject/src/shared/portal/PortalProperty.cpp +++ b/engine/shared/library/sharedObject/src/shared/portal/PortalProperty.cpp @@ -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(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(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(); diff --git a/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjectTableBuffer.cpp b/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjectTableBuffer.cpp index d3472915..1abb6304 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjectTableBuffer.cpp +++ b/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjectTableBuffer.cpp @@ -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));