merge the actual useful, sane appearing changes from DNC. the changes to the crafting system and packet settings may not be so good

CMakeLists.txt

@@ -31,24 +31,19 @@ find_package(ZLIB REQUIRED)
 
 if(WIN32)
 	find_package(Iconv REQUIRED)
+ 	#Dont-Build-PDB RELEASE build use the following (by either commenting---uncommenting the line as needed)
+ 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:libc.lib /SAFESEH:NO")
 
-	#Do-Build-PDB RELEASE build use the following (by either commenting---uncommenting the line as needed)
-	#add -> /OPT:REF /OPT:ICF (if you want to limit what is in the pdb files)
-	#set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG /NODEFAULTLIB:libc.lib /SAFESEH:NO")
-	#Dont-Build-PDB RELEASE build use the following (by either commenting---uncommenting the line as needed)
-	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:libc.lib /SAFESEH:NO")
-
+	####################################
+ 	#Do-Build-PDB RELEASE build use the following (by either commenting---uncommenting the line as needed)
+	#set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DWIN32 -Dwin32 -DUDP_LIBRARY -DDEBUG_LEVEL=0 -DPRODUCTION=1 /Oi /Ot /Oy /O2 /GF /Gy /Zi /MT -D_USE_32BIT_TIME_T=1 -D_MBCS -DPLATFORM_BASE_SINGLE_THREAD -D_CRT_SECURE_NO_WARNINGS /MP /wd4244 /wd4996 /wd4018 /wd4351 /Zc:wchar_t- /Ob1 /FC")
+ 	#Dont-Build-PDB RELEASE build use the following (by either commenting---uncommenting the line as needed)
+	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DWIN32 -Dwin32 -DUDP_LIBRARY -DDEBUG_LEVEL=0 -DPRODUCTION=1 /Oi /Ot /Oy /O2 /GF /Gy /MT -D_USE_32BIT_TIME_T=1 -D_MBCS -DPLATFORM_BASE_SINGLE_THREAD -D_CRT_SECURE_NO_WARNINGS /MP /wd4244 /wd4996 /wd4018 /wd4351 /Zc:wchar_t- /Ob1 /FC")
+ 
+	####################################
 	#Standard DEBUG build use the following	(by either commenting---uncommenting the line as needed)
-	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -DDEBUG_LEVEL=2 -DPRODUCTION=0 /MTd")
-
-	#Do-Build-PDB RELEASE build use the following (by either commenting---uncommenting the line as needed)
-	#set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DDEBUG_LEVEL=0 -DPRODUCTION=1 /Oi /Ot /Oy /O2 /GF /Gy /Zi /MT")
-	#Dont-Build-PDB RELEASE build use the following (by either commenting---uncommenting the line as needed)
-	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DDEBUG_LEVEL=0 -DPRODUCTION=1 /Oi /Ot /Oy /O2 /GF /Gy /MT")
-
-	#Standard add_definitions as follows
-	add_definitions(-DWIN32 -Dwin32 -D_USE_32BIT_TIME_T=1 -D_MBCS -DPLATFORM_BASE_SINGLE_THREAD -D_CRT_SECURE_NO_WARNINGS /MP /wd4244 /wd4996 /wd4018 /wd4351 /Zc:wchar_t- /Ob1 /FC)
-
+	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DWIN32 -Dwin32 -D_DEBUG -DUDP_LIBRARY -DDEBUG_LEVEL=2 -DPRODUCTION=0 /MTd -D_USE_32BIT_TIME_T=1 -D_MBCS -DPLATFORM_BASE_SINGLE_THREAD -D_CRT_SECURE_NO_WARNINGS /MP /wd4244 /wd4996 /wd4018 /wd4351 /Zc:wchar_t- /Ob1 /FC")
+ 
 elseif(UNIX)
 	find_package(Curses REQUIRED)
 

engine/client/application/Miff/src/win32/miff.cpp

@@ -62,15 +62,15 @@ const int   maxStringSize = 256;
 const char  version[] = "1.3 September 18, 2000";
 
 // vars set by pragmas or via command line
-char        drive[4];                               // should be no more then 2 char "C:"
+char        drive[8];                               // should be no more then 2 char "C:"
 char        directory[maxStringSize];
 char        filename[maxStringSize];
 char        extension[8];                           // we'll truncate if the extension is more then 8 chars...
-char        inFileName[maxStringSize];
+char        inFileName[512];
 
 // switches to be sent to mIFF Compiler
 char        sourceBuffer[bufferSize];
-char        outFileName[(maxStringSize * 2) + 8];   // x2 to combine filename, dir, and ext
+char        outFileName[512];   // x2 to combine filename, dir, and ext
 bool        usePragma = false;
 bool        useCCCP = false;
 bool        verboseMode = false;										// default to non-verbose mode
@@ -95,7 +95,7 @@ enum errorType {
 
 		ERR_NONE = 0
 	};
-char        err_msg[512];
+char        err_msg[256];
 errorType   errorFlag = ERR_NONE;            // assume no error (default)
 
 
@@ -211,7 +211,7 @@ int main(	int argc,				// number of args in commandline
 	SetupSharedFoundationData.useWindowHandle  = false;
 	SetupSharedFoundationData.argc = argc;
 	SetupSharedFoundationData.argv = argv;	
-	SetupSharedFoundationData.demoMode = true;
+	SetupSharedFoundationData.demoMode = false;
 	SetupSharedFoundation::install (SetupSharedFoundationData);
 
 	SetupSharedCompression::install();
@@ -832,20 +832,21 @@ static int preprocessSource(char *sourceName)
 		// -dD                   - output #defines (for the purpose of error msg I parse)
 		// -H                    - display the name of the header/included files (verbose mode)
 		// -P                    - originally, I had this...  so it won't show the # line_num "filename" ???
-		if (!useCCCP && verboseMode)
-		{
-			sprintf(shellCommand, "cpp.exe -nostdinc -nostdinc++ -pedantic -Wall -dD -H %s mIFF.$$$", sourceName);
-		}
-		else if (!useCCCP && !verboseMode)
-		{
-			sprintf(shellCommand, "cpp.exe -nostdinc -nostdinc++ -pedantic -Wall -dD %s mIFF.$$$", sourceName);
-		}
-		else if (useCCCP && verboseMode)
-		{
-			sprintf(shellCommand, "cccp.exe -nostdinc -nostdinc++ -pedantic -Wall -dD -H %s mIFF.$$$", sourceName);
-		}
-		else
-			sprintf(shellCommand, "cccp.exe -nostdinc -nostdinc++ -pedantic -Wall -dD %s mIFF.$$$", sourceName);
+ 		if (!useCCCP && verboseMode)
+ 		{
+			sprintf(shellCommand, "cpp.exe -nostdinc -nostdinc++ -x c++ -pedantic -Wall -dD -H %s mIFF.$$$", sourceName);
+ 		}
+ 		else if (!useCCCP && !verboseMode)
+ 		{
+			sprintf(shellCommand, "cpp.exe -nostdinc -nostdinc++ -x c++ -pedantic -Wall -dD %s mIFF.$$$", sourceName);
+ 		}
+ 		else if (useCCCP && verboseMode)
+ 		{
+			sprintf(shellCommand, "cccp.exe -nostdinc -nostdinc++ -x c++ -pedantic -Wall -dD -H %s mIFF.$$$", sourceName);
+ 		}
+ 		else
+			sprintf(shellCommand, "cccp.exe -nostdinc -nostdinc++ -x c++ -pedantic -Wall -dD %s mIFF.$$$", sourceName);
+ 	}
 	}
 //	else
 	{

engine/client/application/Miff/src/win32/parser.lex

@@ -351,7 +351,7 @@ static char	*MIFFInputStream;
 int			column = 0;
 int			line_num = 1;
 int			line_num2 = 1;
-char		error_line_buffer[4096];
+char		error_line_buffer[256];
 long		brace_counter = 0;
 
 

engine/server/application/ConnectionServer/src/shared/ConnectionServer.cpp

@@ -1218,7 +1218,7 @@ void ConnectionServer::setupConnections()
 	NetworkSetupData setup;
 	setup.port = ConfigConnectionServer::getGameServicePort();
 	setup.bindInterface = ConfigConnectionServer::getGameServiceBindInterface();
-	setup.maxConnections = 100;
+	setup.maxConnections = 1000;
 
 	gameService = new Service(ConnectionAllocator<GameConnection>(), setup);
 	connectToMessage("GameConnectionOpened");

engine/server/application/LoginServer/src/shared/ConfigLoginServer.cpp

@@ -100,12 +100,12 @@ void ConfigLoginServer::install(void)
 	KEY_INT (clusterGroup,1);
 	KEY_INT(maxSimultaneousPurgeAccounts,1000);
 	KEY_INT(purgeSleepTime,600);
-	KEY_BOOL(enableStructurePurge,false);
-	KEY_BOOL(enableCharacterPurge,false);
+	KEY_BOOL(enableStructurePurge,true);
+	KEY_BOOL(enableCharacterPurge,true);
 	KEY_INT (updatePurgeAccountListTime, 0);
 	KEY_STRING (purgeAccountSourceTable,"account_extract");
 	KEY_STRING (adminAccountDataTable, "datatables/admin/us_admin.iff");
-	KEY_BOOL(allowSkipTutorialToAll,false);
+	KEY_BOOL(allowSkipTutorialToAll,true);
 	KEY_BOOL(internalBypassOnlineLimit,true);
 	KEY_INT (populationExtremelyHeavyThresholdPercent, 50);
 	KEY_INT (populationVeryHeavyThresholdPercent, 40);

engine/server/application/LoginServer/src/shared/LoginServer.cpp

@@ -158,7 +158,7 @@ m_soeMonitor(0)
 	if (ConfigLoginServer::getDevelopmentMode())
 	{
 		setup.port = ConfigLoginServer::getCentralServicePort();
-		setup.maxConnections = 100;
+		setup.maxConnections = 1000;
 		m_centralService = new Service(ConnectionAllocator<CentralServerConnection>(), setup);
 	}
 	

engine/server/application/PlanetServer/src/shared/PlanetServer.cpp

@@ -141,7 +141,7 @@ PlanetServer::PlanetServer() :
 	NetworkSetupData setup;
 	setup.port = ConfigPlanetServer::getGameServicePort();
 	setup.bindInterface = ConfigPlanetServer::getGameServiceBindInterface();
-	setup.maxConnections = 100;
+	setup.maxConnections = 1000;
 	m_gameService = new Service(ConnectionAllocator<GameServerConnection>(), setup);
 
 	// set up watcher connection

engine/server/application/PlanetServer/src/shared/PreloadManager.cpp

@@ -59,7 +59,7 @@ void PreloadManager::handlePreloadList()
 	m_listReceived=true;
 
 	WARNING(ConfigPlanetServer::getLoadWholePlanet() && ConfigPlanetServer::getLoadWholePlanetMultiserver(),("You have specified both loadWholePlanet and loadWholePlanetMultiserver.  LoadWholePlanet (single-server) will take precedence."));
-	
+
 	if (ConfigPlanetServer::getLoadWholePlanet() || PlanetServer::getInstance().isInSpaceMode() || !PlanetServer::getInstance().getEnablePreload())
 	{
 		// Set up a single server to handle the whole planet
@@ -71,103 +71,66 @@ void PreloadManager::handlePreloadList()
 		fakeBeacon.m_cityServerId = 1;
 		fakeBeacon.m_wildernessServerId = 1;
 
-		m_preloadList->clear();
+		//m_preloadList->clear();
 		m_preloadList->push_back(fakeBeacon);
-		
+
 		m_serversWaiting->insert(1);
+
 		PreloadServerInformation & psi = (*m_serverMap)[1];
 		psi.m_actualServerId = 0;
 		psi.m_timeLoadStarted = time(0);
 		psi.m_loadTime = -1;
+
 	}
-	// WTF is this ... the tutorial planet bypasses the preload multiserver setting in favor of this pie slice algorithm
-	// We should not need this anymore with the NPE tutorial
-	// NPE will use the preload tables for multiserver and the 'NewbieTutorial' manager for placing the tutotial instances 
-	/*
-	else if(PlanetServer::getInstance().isInTutorialMode())
+	if (PlanetServer::getInstance().getEnablePreload())
 	{
-		m_preloadList->clear();
+		DataTable * data = DataTableManager::getTable(ConfigPlanetServer::getPreloadDataTableName(),true);
+		FATAL(data==NULL,("Could not find data table %s, needed for preload",ConfigPlanetServer::getPreloadDataTableName()));
 
-		int n=ConfigPlanetServer::getNumTutorialServers();
-		if ((ConfigPlanetServer::getMaxGameServers() != 0) && (n > ConfigPlanetServer::getMaxGameServers()))
-			n=ConfigPlanetServer::getMaxGameServers();
-		for (int i=0 ; i<n; ++i)
+		int numRows = data->getNumRows();
+		for (int row=0; row<numRows; ++row)
 		{
-			float angle = PI_TIMES_2 * (static_cast<float>(i)/static_cast<float>(n));
-
-			// Make a circle of load beacons.  The effect will be to divide the map into wedges
-			PreloadListData fakeBeacon;
-			fakeBeacon.m_topLeftChunkX = Node::roundToNode(static_cast<int>(cos(angle) * 1000.0f));
-			fakeBeacon.m_topLeftChunkZ = Node::roundToNode(static_cast<int>(sin(angle) * 1000.0f));
-			fakeBeacon.m_bottomRightChunkX = fakeBeacon.m_topLeftChunkX + Node::getNodeSize();
-			fakeBeacon.m_bottomRightChunkZ = fakeBeacon.m_topLeftChunkZ + Node::getNodeSize();
-			fakeBeacon.m_cityServerId = i+1;
-			fakeBeacon.m_wildernessServerId = i+1;
-
-			DEBUG_REPORT_LOG(true,("Loadbeacon at %i, %i\n",fakeBeacon.m_topLeftChunkX, fakeBeacon.m_topLeftChunkZ));
-			
-			m_preloadList->push_back(fakeBeacon);
-			PreloadServerInformation & psi = (*m_serverMap)[i+1];
-			psi.m_actualServerId = 0;
-			psi.m_timeLoadStarted = time(0);
-			psi.m_loadTime = -1;
-			m_serversWaiting->insert(i+1);
-		}
-	}*/
-	else
-	{
-		if (PlanetServer::getInstance().getEnablePreload())
-		{
-			DataTable * data = DataTableManager::getTable(ConfigPlanetServer::getPreloadDataTableName(),true);
-			FATAL(data==NULL,("Could not find data table %s, needed for preload",ConfigPlanetServer::getPreloadDataTableName()));
-			
-			int numRows = data->getNumRows();
-			for (int row=0; row<numRows; ++row)
+			if (data->getStringValue("Scene",row)==Scene::getInstance().getSceneId())
 			{
-				if (data->getStringValue("Scene",row)==Scene::getInstance().getSceneId())
-				{
-					PreloadListData item;
-					item.m_topLeftChunkX=data->getIntValue("Top Left Chunk X",row);
-					item.m_topLeftChunkZ=data->getIntValue("Top Left Chunk Z",row);
-					item.m_bottomRightChunkX=data->getIntValue("Bottom Right Chunk X",row);
-					item.m_bottomRightChunkZ=data->getIntValue("Bottom Right Chunk Z",row);
-					item.m_cityServerId=data->getIntValue("City Server Id",row);
-					item.m_wildernessServerId=data->getIntValue("Wilderness Server Id",row);
+				PreloadListData item;
+				item.m_topLeftChunkX=data->getIntValue("Top Left Chunk X",row);
+				item.m_topLeftChunkZ=data->getIntValue("Top Left Chunk Z",row);
+				item.m_bottomRightChunkX=data->getIntValue("Bottom Right Chunk X",row);
+				item.m_bottomRightChunkZ=data->getIntValue("Bottom Right Chunk Z",row);
+				item.m_cityServerId=data->getIntValue("City Server Id",row);
+				item.m_wildernessServerId=data->getIntValue("Wilderness Server Id",row);
 
-					if (ConfigPlanetServer::getMaxGameServers() != 0)
-					{
-						// Reduce the total number of game servers
-						item.m_cityServerId = ((item.m_cityServerId - 1) % ConfigPlanetServer::getMaxGameServers()) + 1;
+				//if (ConfigPlanetServer::getMaxGameServers() != 0)
+				//{
+				//	// Reduce the total number of game servers
+				//	item.m_cityServerId = ((item.m_cityServerId - 1) % ConfigPlanetServer::getMaxGameServers()) + 1;
 
-						if (item.m_wildernessServerId != 0)
-							item.m_wildernessServerId = ((item.m_wildernessServerId - 1) % ConfigPlanetServer::getMaxGameServers()) + 1;
-					}
+				//	if (item.m_wildernessServerId != 0)
+				//			item.m_wildernessServerId = ((item.m_wildernessServerId - 1) % ConfigPlanetServer::getMaxGameServers()) + 1;
+				//}
 					
-					m_preloadList->push_back(item);
+				m_preloadList->push_back(item);
 				
-					ServerMapType::iterator mapIter = m_serverMap->find(item.m_cityServerId);
-					if (mapIter == m_serverMap->end())
-					{
-						PreloadServerInformation & psi = (*m_serverMap)[item.m_cityServerId];
-						psi.m_actualServerId = 0;
-						psi.m_timeLoadStarted = time(0);
-						psi.m_loadTime = -1;
-						m_serversWaiting->insert(item.m_cityServerId);
-					}
-
-					if (item.m_wildernessServerId != 0)
-					{
-						mapIter = m_serverMap->find(item.m_wildernessServerId);
-						if (mapIter == m_serverMap->end())
-						{
-							PreloadServerInformation & psi = (*m_serverMap)[item.m_wildernessServerId];
-							psi.m_actualServerId = 0;
-							psi.m_timeLoadStarted = time(0);
-							psi.m_loadTime = -1;
-							m_serversWaiting->insert(item.m_wildernessServerId);
-						}
-					}
+				ServerMapType::iterator mapIter = m_serverMap->find(item.m_cityServerId);
+				if (mapIter == m_serverMap->end())
+				{
+					PreloadServerInformation & psi = (*m_serverMap)[item.m_cityServerId];
+					psi.m_actualServerId = 0;
+					psi.m_timeLoadStarted = time(0);
+					psi.m_loadTime = -1;
 				}
+				//if (item.m_wildernessServerId != 0)
+				//{
+				//	ServerMapType::iterator mapIter = m_serverMap->find(item.m_wildernessServerId);
+				//	if (mapIter == m_serverMap->end())
+				//	{
+				//		PreloadServerInformation & psi = (*m_serverMap)[item.m_wildernessServerId];
+				//		psi.m_actualServerId = 0;
+				//		psi.m_timeLoadStarted = time(0);
+				//		psi.m_loadTime = -1;
+				//		//m_serversWaiting->insert(item.m_wildernessServerId);
+				//	}
+				//}
 			}
 		}
 	}

engine/server/application/TaskManager/src/shared/TaskManager.cpp

@@ -526,7 +526,7 @@ void TaskManager::run()
 	NetworkHandler::install();
 	NetworkSetupData setup;
 	setup.port = ConfigTaskManager::getGameServicePort();
-	setup.maxConnections = 100;
+	setup.maxConnections = 1000;
 	setup.bindInterface = ConfigTaskManager::getGameServiceBindInterface();
 	instance().m_taskService = new Service(ConnectionAllocator<TaskConnection>(), setup);
 	setup.port = ConfigTaskManager::getTaskManagerServicePort();

engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.cpp

@@ -1112,7 +1112,9 @@ void CommoditiesMarket::install()
 	}
 	else
 	{
+#ifdef DEBUG
 		WARNING(true, ("[Commodities API] : No commodities server connection to send SetGameTime.\n"));
+#endif
 		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 	}
 	
@@ -1180,7 +1182,9 @@ void CommoditiesMarket::giveTime()
 	{
 		if (Clock::timeSeconds() - ConfigServerGame::getCommoditiesServerReconnectIntervalSec() > reconnectTime)
 		{
+#ifdef DEBUG
 			WARNING(true, ("[Commodities API] : No commodities server connection to send GiveTime.\n"));
+#endif
 			getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 			reconnectTime = Clock::timeSeconds();
 		}
@@ -1391,8 +1395,10 @@ void CommoditiesMarket::onAddAuction(int sequence, int32 result, const NetworkId
 			}	
 			else
 			{
+#ifdef DEBUG
 				WARNING(true, ("[Commodities API] : No commodities server connection to send CancelAuction.\n"));
 				getCommoditiesServerConnection(); //attempt to reconnect to commodities server
+#endif
 			}
 		}
 		CreateAuctionResponseMessage msg(NetworkId(itemId.getValue()),
@@ -1507,7 +1513,9 @@ void CommoditiesMarket::auctionCreate(CreatureObject &owner, ServerObject &item,
 		}
 		else
 		{
+#ifdef DEBUG
 			WARNING(true, ("[Commodities API] : No commodities server connection to send AddAuction.\n"));
+#endif
 			getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 		}
 		
@@ -1577,7 +1585,9 @@ void CommoditiesMarket::transferVendorItemFromStockroom(CreatureObject &owner, N
 		}
 		else
 		{
+#ifdef DEBUG
 			WARNING(true, ("[Commodities API] : No commodities server connection to send AddImmediateAuction.\n"));
+#endif
 			getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 		}
 			
@@ -1750,7 +1760,9 @@ void CommoditiesMarket::auctionCreateImmediate(CreatureObject &owner, ServerObje
 		}
 		else
 		{
+#ifdef DEBUG
 			WARNING(true, ("[Commodities API] : No commodities server connection to send AddImmediateAuction.\n"));
+#endif
 			getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 		}
 		
@@ -1767,8 +1779,9 @@ void CommoditiesMarket::auctionCreatePermanent(const std::string &, const Server
 {
 	if (!ConfigServerGame::getCommoditiesMarketEnabled())
 		return;
-
+#ifdef DEBUG
 	WARNING(true, ("auctionCreatePermanent has been depricated and shouldn't be used.  If you see this WARNING, add a line to catch cheaters in the command in CommandCppFuncs.cpp"));
+#endif
 	return;
 	
 #if 0
@@ -1819,7 +1832,9 @@ void CommoditiesMarket::auctionCreatePermanent(const std::string &, const Server
 	}
 	else
 	{
+#ifdef DEBUG
 		WARNING(true, ("[Commodities API] : No commodities server connection to send AddImmediateAuction.\n"));
+#endif
 		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 	}
 #endif
@@ -1881,7 +1896,9 @@ void CommoditiesMarket::auctionBid(CreatureObject &bidder, AuctionId auctionId,
 		}
 		else
 		{
+#ifdef DEBUG
 			WARNING(true, ("[Commodities API] : No commodities server connection to send AddBid.\n"));
+#endif
 			getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 		}
 		//response message will be sent in onAddBid
@@ -1918,7 +1935,9 @@ void CommoditiesMarket::auctionCancel(const NetworkId &playerId, AuctionId aucti
 	}
 	else
 	{
+#ifdef DEBUG
 		WARNING(true, ("[Commodities API] : No commodities server connection to send CancelAuction.\n"));
+#endif
 		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 	}
 }
@@ -2086,7 +2105,9 @@ void CommoditiesMarket::auctionQueryHeaders(
 	}
 	else
 	{
+#ifdef DEBUG
 		WARNING(true, ("[Commodities API] : No commodities server connection to send QueryAuctionHeaders.\n"));
+#endif
 		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 	}
 
@@ -2136,7 +2157,9 @@ void CommoditiesMarket::getAuctionDetails(CreatureObject &who, const NetworkId &
 	}
 	else
 	{
+#ifdef DEBUG
 		WARNING(true, ("[Commodities API] : No commodities server connection to send GetItemDetails.\n"));
+#endif
 		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 	}
 }
@@ -2152,7 +2175,9 @@ void CommoditiesMarket::getVendorValue(ServerObject &container)
 	}
 	else
 	{
+#ifdef DEBUG
 		WARNING(true, ("[Commodities API] : No commodities server connection to send GetVendorValue.\n"));
+#endif
 		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 	}
 }
@@ -2170,7 +2195,9 @@ void CommoditiesMarket::createVendorMarket(const CreatureObject &who, ServerObje
 	}
 	else
 	{
+#ifdef DEBUG
 		WARNING(true, ("[Commodities API] : No commodities server connection to send CreateVendorMarket.\n"));
+#endif
 		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 	}
 
@@ -2192,7 +2219,9 @@ void CommoditiesMarket::destroyVendorMarket(const NetworkId &playerId, ServerObj
 	}
 	else
 	{
+#ifdef DEBUG
 		WARNING(true, ("[Commodities API] : No commodities server connection to send DestroyVendorMarket.\n"));
+#endif
 		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 	}
 }
@@ -2210,7 +2239,9 @@ void CommoditiesMarket::deleteAuctionLocation(const NetworkId& locationId, const
 	}
 	else
 	{
+#ifdef DEBUG
 		WARNING(true, ("[Commodities API] : No commodities server connection to send DestroyVendorMarket.\n"));
+#endif
 		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 	}
 }
@@ -2230,7 +2261,9 @@ void CommoditiesMarket::isVendorOwner(CreatureObject &who, const NetworkId &cont
 		}
 		else
 		{
+#ifdef DEBUG
 			WARNING(true, ("[Commodities API] : No commodities server connection to send GetVendorOwner.\n"));
+#endif
 			onIsVendorOwner(who.getNetworkId(), zeroNetworkId, zeroNetworkId);
 			getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 		}
@@ -2533,7 +2566,9 @@ void CommoditiesMarket::checkPendingLoads(const NetworkId &itemId)
 					}
 					else
 					{
+#ifdef DEBUG
 						WARNING(true, ("[Commodities API] : No commodities server connection to send GetItem.\n"));
+#endif						
 						getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 					}
 				}
@@ -3378,7 +3413,9 @@ bool CommoditiesMarket::restoreItem(ServerObject& item, TangibleObject & vendor)
 	}
 	else
 	{
+#ifdef DEBUG
 		WARNING(true, ("[Commodities API] : No commodities server connection to send AddImmediateAuction.\n"));
+#endif
 		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
 		
 	}

engine/server/library/serverGame/src/shared/console/ConsoleCommandParserServer.cpp

@@ -460,12 +460,12 @@ bool ConsoleCommandParserServer::performParsing (const NetworkId & userId, const
 	//-----------------------------------------------------------------
 	else if (isAbbrev( argv[0], "dumpMemToFile"))
 	{	
-		//std::string fileName(Unicode::wideToNarrow(argv[1]));
-		//std::string leakStr(Unicode::wideToNarrow(argv[2]));
-		//bool leak = (leakStr == "true" || leakStr == "1");
-		//	
-		//MemoryManager::reportToFile(fileName.c_str(), leak);
-		//result += getErrorMessage (argv[0], ERR_SUCCESS);
+		std::string fileName(Unicode::wideToNarrow(argv[1]));
+		std::string leakStr(Unicode::wideToNarrow(argv[2]));
+		bool leak = (leakStr == "true" || leakStr == "1");
+			
+		MemoryManager::reportToFile(fileName.c_str(), leak);
+		result += getErrorMessage (argv[0], ERR_SUCCESS);
 	}
 	
 	//-----------------------------------------------------------------

engine/server/library/serverGame/src/shared/core/ConfigServerGame.cpp

@@ -38,7 +38,7 @@ void ConfigServerGame::install(void)
 	ConfigServerUtility::install();
 	data = &staticData;
 
-	KEY_BOOL    (allowDefaultTemplateParams, false);
+	KEY_BOOL    (allowDefaultTemplateParams, true);
 	KEY_BOOL    (skipTutorial, false);
 	KEY_STRING	(groundScene, 0);
 	KEY_STRING	(spaceScene, 0);
@@ -66,7 +66,7 @@ void ConfigServerGame::install(void)
 	KEY_BOOL    (useRemoteDebugJava, false);
 	KEY_BOOL    (profileScripts, false);
 	KEY_BOOL    (crashOnScriptError, false);
-	KEY_BOOL    (compileScripts, true);
+	KEY_BOOL    (compileScripts, false);
 	KEY_BOOL    (trapScriptCrashes, true);
 	KEY_INT     (scriptWatcherWarnTime, 5000);
 	KEY_INT     (scriptWatcherInterruptTime, 5000);
@@ -241,7 +241,7 @@ void ConfigServerGame::install(void)
 	KEY_STRING  (gameServiceBindInterface, "");
 	KEY_BOOL    (logPvpUpdates, false);
 	KEY_FLOAT   (npcConversationDistance, 6.0f);
-	KEY_INT     (serverSpawnLimit, 800);
+	KEY_INT     (serverSpawnLimit, 1200);
 	KEY_INT     (spawnQueueSize, 1);
 	KEY_INT     (framesPerSpawn, 0);
 	KEY_BOOL    (enableSpawningNearLoadBeacons, true);
@@ -255,8 +255,8 @@ void ConfigServerGame::install(void)
 	KEY_INT     (maxGalacticReserveDepositBillion, 3); // 3 billion
 	KEY_INT     (maxMoneyTransfer,  100000000); // 100 million
 	KEY_INT     (maxFreeTrialMoney, 50000); //50k credits limited to demo customers
-	KEY_BOOL    (enablePreload, false);
-	KEY_BOOL    (buildPreloadLists, false);
+	KEY_BOOL    (enablePreload, true);
+	KEY_BOOL    (buildPreloadLists, true);
 	KEY_BOOL    (logAuthTransfer, false);
 
 	KEY_INT     (overrideUpdateRadius, 0);
@@ -285,7 +285,7 @@ void ConfigServerGame::install(void)
 	KEY_INT     (loadHouseContentsDelaySeconds, 0);
 	KEY_BOOL    (boundarySpawningAllowed, true);
 	KEY_BOOL    (debugMovement, false);
-	KEY_BOOL    (spawnAllResources, false);
+	KEY_BOOL    (spawnAllResources, true);
 	KEY_BOOL    (skipUnreliableTransformsForOtherCells, false);
 	KEY_INT     (maxPlayerSanityCheckFailures, 3);
 	KEY_BOOL    (disablePlayerSanityChecker, false);
@@ -321,12 +321,12 @@ void ConfigServerGame::install(void)
 	KEY_BOOL    (logoutTriggerEnabled, true);
 	KEY_BOOL    (loginAsBountyHunter, false);
 	KEY_INT     (veteranRewardTradeInWaitPeriodSeconds, 30 * 24 * 60 * 60); // 30 days
-	KEY_BOOL    (enableVeteranRewards, false);
-	KEY_BOOL    (enableOneYearAnniversary, false);
+	KEY_BOOL    (enableVeteranRewards, true);
+	KEY_BOOL    (enableOneYearAnniversary, true);
 	KEY_INT     (minEntitledTime, -1);
 	KEY_BOOL    (veteranDebugTriggerAll, false);
 	KEY_BOOL    (veteranDebugEnableOverrideAccountAge, false);
-	KEY_BOOL    (enableNewVeteranRewards, false);
+	KEY_BOOL    (enableNewVeteranRewards, true);
 	KEY_FLOAT   (buddyPointTimeBonus, 30.0f/4.0f); // 4 buddy points = 30 days
 
 #ifdef _DEBUG
@@ -334,7 +334,7 @@ void ConfigServerGame::install(void)
 #endif
 
 	KEY_INT     (theaterCreationLimitMilliseconds, 25);
-	KEY_BOOL    (fatalOnGoldPobChange, true);
+	KEY_BOOL    (fatalOnGoldPobChange, false);
 	KEY_INT     (lineOfSightCacheDurationMs, 1500);
 	KEY_FLOAT   (lineOfSightCacheMinHeight, 0.8f);
 	KEY_FLOAT   (lineOfSightLocationRoundValue, 5.0f);
@@ -376,7 +376,7 @@ void ConfigServerGame::install(void)
 	}
 
 	KEY_BOOL    (sendAsteroidExtents, false);
-	KEY_BOOL    (createZoneObjects, false);
+	KEY_BOOL    (createZoneObjects, true);
 	KEY_INT     (shipUpdatesPerSecond, 32);
 	KEY_BOOL    (debugSpaceVisibilityManager, false);
 	KEY_INT     (groundFrameRateLimit, 5);

engine/shared/application/DataTableTool/src/shared/DataTableTool.cpp

@@ -107,7 +107,7 @@ int main(int argc, char **argv)
 		data.argc  = argc;
 		data.argv  = argv;
 #if defined(PLATFORM_WIN32)
-		data.demoMode = true;
+		data.demoMode = false;
 #endif
 //Remove need for tools.cfg.  You should include the path directly.  This fixes the annoying warning that desigers get.
 //		data.configFile = "tools.cfg";

engine/shared/library/sharedFile/src/shared/FileStreamer.cpp

@@ -124,7 +124,7 @@ FileStreamer::File *FileStreamer::open(const char *fileName, bool randomAccess)
 	reportModDirectory(fileName, "music/", "Music") ||
 	reportModDirectory(fileName, "sound/", "Sound") ||
 	reportModDirectory(fileName, "camera/", "Camera"); // ||
-	//reportModDirectory(fileName, "shader/", "Shader");
+	reportModDirectory(fileName, "shader/", "Shader");
 #endif
 
 	// return the opened file

engine/shared/library/sharedLog/src/shared/ConfigSharedLog.cpp

@@ -38,7 +38,7 @@ void ConfigSharedLog::install()
 	KEY_INT (logNetQueueSize,   2000);
 	KEY_INT (logNetReconnectTimeMs, 10000);
 	KEY_BOOL(logReportLogs,     false);
-	KEY_BOOL(logReportWarnings, true);
+	KEY_BOOL(logReportWarnings, false);
 	KEY_BOOL(logReportFatals,   true);
 	KEY_BOOL(logStderr,         false);
 

engine/shared/library/sharedSkillSystem/src/shared/SkillObject.cpp

@@ -34,7 +34,6 @@ namespace
 {
 	int       s_recursionCountDepends    = 0;
 	const int s_recursionCountDependsMax = 7;
-	const std::string m_Deprecated = "DEPRECATED_SKILLS";
 
 	//----------------------------------------------------------------------
 
@@ -437,11 +436,6 @@ void SkillObject::connectLinks(DataTable &dataTable, const std::string & parentN
 			{
 				skillData.nextSkillBoxes.push_back(nextSkill);
 			}
-			else
-			{
-				if (m_Deprecated.compare(nextSkillName.c_str()) != 0)
-					WARNING (true, ("Could not find skill %s in DataTable", nextSkillName.c_str()));
-			}
 		}
 	}
 
@@ -470,8 +464,6 @@ bool SkillObject::load(DataTable & dataTable, const std::string & skillName)
 	if (skillRow == -1)
 	{
 		skillData = SkillData();		
-		if (m_Deprecated.compare(skillName.c_str()) != 0)
-			WARNING (true, ("SkillObject::load Could not find skill %s in DataTable", skillName.c_str()));
 		return false;
 	}