diff --git a/engine/server/library/serverGame/src/shared/console/CentralCommandParserGame.cpp b/engine/server/library/serverGame/src/shared/console/CentralCommandParserGame.cpp index d9389fd3..95941c85 100644 --- a/engine/server/library/serverGame/src/shared/console/CentralCommandParserGame.cpp +++ b/engine/server/library/serverGame/src/shared/console/CentralCommandParserGame.cpp @@ -66,22 +66,6 @@ bool CentralCommandParserGame::performParsing (const NetworkId &, const StringVe retval = true; } } - else if( cmd == "public" ) - { -// LOG("ServerConsole", ("Setting cluster to public.")); - SetConnectionServerPublic const p(true); - GameServer::getInstance().sendToCentralServer(p); - result += Unicode::narrowToWide("Cluster set to public.\n"); - retval = true; - } - else if( cmd == "private" ) - { -// LOG("ServerConsole", ("Setting cluster to private.")); - SetConnectionServerPublic const p(false); - GameServer::getInstance().sendToCentralServer(p); - result += Unicode::narrowToWide("Cluster set to private.\n"); - retval = true; - } else if(cmd == "systemMessage") { std::string targetId = "SWG." + GameServer::getInstance().getClusterName() + ".SYSTEM"; diff --git a/engine/server/library/serverGame/src/shared/object/TangibleObject.cpp b/engine/server/library/serverGame/src/shared/object/TangibleObject.cpp index 6d58c476..df48bb7f 100644 --- a/engine/server/library/serverGame/src/shared/object/TangibleObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/TangibleObject.cpp @@ -3426,7 +3426,7 @@ void TangibleObject::clearCraftingManufactureSchematic(void) if (container) { Container::ContainerErrorCode error = Container::CEC_Success; - CachedNetworkId schematicId = container->getObjectInSlot( + schematicId = container->getObjectInSlot( getCraftingManufactureSchematicSlotId(), error); } else diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsNewbieTutorial.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsNewbieTutorial.cpp index 7e54e09a..b94f7349 100644 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsNewbieTutorial.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsNewbieTutorial.cpp @@ -52,7 +52,7 @@ namespace ScriptMethodsNewbieTutorialNamespace else { WARNING (true, ("newbieTutorialSendStartingLocationsToPlayer: bad controller")); - delete & msg; + delete msg; } } diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpMisc.cpp b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpMisc.cpp index 754343fe..15718755 100644 --- a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpMisc.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpMisc.cpp @@ -87,10 +87,10 @@ int UdpMisc::Crc32(const void *buffer, int bufferLen, int encryptValue) 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D}; int crc = 0xffffffff; - crc = (crc >> 8) & 0x00FFFFFFL) ^ crc32_table[(crc ^ (encryptValue & 0xff)) & 0x000000FFL]; - crc = (crc >> 8) & 0x00FFFFFFL) ^ crc32_table[(crc ^ ((encryptValue >> 8) & 0xff)) & 0x000000FFL]; - crc = (crc >> 8) & 0x00FFFFFFL) ^ crc32_table[(crc ^ ((encryptValue >> 16) & 0xff)) & 0x000000FFL]; - crc = (crc >> 8) & 0x00FFFFFFL) ^ crc32_table[(crc ^ ((encryptValue >> 24) & 0xff)) & 0x000000FFL]; + crc = ((crc >> 8) & 0x00FFFFFFL) ^ crc32_table[(crc ^ (encryptValue & 0xff)) & 0x000000FFL]; + crc = ((crc >> 8) & 0x00FFFFFFL) ^ crc32_table[(crc ^ ((encryptValue >> 8) & 0xff)) & 0x000000FFL]; + crc = ((crc >> 8) & 0x00FFFFFFL) ^ crc32_table[(crc ^ ((encryptValue >> 16) & 0xff)) & 0x000000FFL]; + crc = ((crc >> 8) & 0x00FFFFFFL) ^ crc32_table[(crc ^ ((encryptValue >> 24) & 0xff)) & 0x000000FFL]; const udp_uchar *bufPtr = (const udp_uchar *)buffer; const udp_uchar *endPtr = (const udp_uchar *)buffer + bufferLen; diff --git a/external/ours/library/localization/src/shared/LocalizedStringTableReaderWriter.cpp b/external/ours/library/localization/src/shared/LocalizedStringTableReaderWriter.cpp index 049b8a81..19e95784 100644 --- a/external/ours/library/localization/src/shared/LocalizedStringTableReaderWriter.cpp +++ b/external/ours/library/localization/src/shared/LocalizedStringTableReaderWriter.cpp @@ -529,7 +529,6 @@ void LocalizedStringTableRW::prepareTable (const LocalizedStringTableRW & rhs) m_idNameMap = rhs.m_idNameMap; m_nameMap = rhs.m_nameMap; - m_map.clear (); m_nextUniqueId = rhs.m_nextUniqueId; m_name = rhs.m_name;