hopefully fix a few more

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";

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

engine/server/library/serverScript/src/shared/ScriptMethodsNewbieTutorial.cpp

@@ -52,7 +52,7 @@ namespace ScriptMethodsNewbieTutorialNamespace
 		else
 		{
 			WARNING (true, ("newbieTutorialSendStartingLocationsToPlayer: bad controller"));
-			delete & msg;
+			delete msg;
 		}
 	}
 

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;

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;