some game file cleanups

This commit is contained in:
SWG Master
2015-08-06 20:33:14 -05:00
parent d9d72d6152
commit c71eb284be
21 changed files with 92 additions and 92 deletions
+60 -60
View File
@@ -1,60 +1,60 @@
cmake_policy(SET CMP0003 OLD) # or cmake_policy(VERSION 2.4)
cmake_minimum_required(VERSION 2.8)
project(swgnge C CXX)
if(WIN32)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/win32")
elseif(UNIX)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/linux")
endif()
set(SWG_ROOT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(SWG_ENGINE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/engine)
set(SWG_EXTERNALS_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external)
set(SWG_EXTERNALS_FIND ${CMAKE_CURRENT_SOURCE_DIR}/external/3rd/library)
set(SWG_GAME_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/game)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
find_package(BISON REQUIRED)
find_package(Boost REQUIRED)
find_package(FLEX REQUIRED)
find_package(JNI REQUIRED)
find_package(LibXml2 REQUIRED)
find_package(Oracle REQUIRED)
find_package(PCRE REQUIRED)
find_package(Perl REQUIRED)
find_package(Threads)
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)
#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} -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)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -DDEBUG_LEVEL=2 -DPRODUCTION=0 -g -O0")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DDEBUG_LEVEL=0 -DPRODUCTION=1 -O3 -s")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-write-strings")
add_definitions(-DLINUX -D_REENTRANT -Dlinux -D_USING_STL -D__STL_NO_BAD_ALLOC -D_GNU_SOURCE -D_XOPEN_SOURCE=500)
endif()
add_subdirectory(external)
add_subdirectory(engine)
add_subdirectory(game)
cmake_policy(SET CMP0003 OLD) # or cmake_policy(VERSION 2.4)
cmake_minimum_required(VERSION 2.8)
project(swgnge C CXX)
if(WIN32)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/win32")
elseif(UNIX)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/linux")
endif()
set(SWG_ROOT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(SWG_ENGINE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/engine)
set(SWG_EXTERNALS_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external)
set(SWG_EXTERNALS_FIND ${CMAKE_CURRENT_SOURCE_DIR}/external/3rd/library)
set(SWG_GAME_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/game)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
find_package(BISON REQUIRED)
find_package(Boost REQUIRED)
find_package(FLEX REQUIRED)
find_package(JNI REQUIRED)
find_package(LibXml2 REQUIRED)
find_package(Oracle REQUIRED)
find_package(PCRE REQUIRED)
find_package(Perl REQUIRED)
find_package(Threads)
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)
#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} -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)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -DDEBUG_LEVEL=2 -DPRODUCTION=0 -g -pipe -Wall -Wno-unknown-pragmas -O0")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DDEBUG_LEVEL=0 -DPRODUCTION=1 -march=native -pipe -mtune=native -O2 -s")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-write-strings")
add_definitions(-DLINUX -D_REENTRANT -Dlinux -D_USING_STL -D__STL_NO_BAD_ALLOC -D_GNU_SOURCE -D_XOPEN_SOURCE=500)
endif()
add_subdirectory(external)
add_subdirectory(engine)
add_subdirectory(game)
@@ -1405,7 +1405,7 @@ bool Auction::IsAdvancedFilterMatch(std::list<AuctionQueryHeadersMessage::Search
int filterCountMatch = 0;
int filterCountNotMatch = 0;
bool applicableFilter;
bool applicableFilter = 0;
bool matchFilter;
for (std::list<AuctionQueryHeadersMessage::SearchCondition>::const_iterator iter = advancedSearch.begin(); iter != advancedSearch.end(); ++iter)
{
@@ -70,7 +70,7 @@ void LoggingServerApi::Connect(const char *address, int port, const char *loginN
params.port = 0;
params.pooledPacketMax = 1000;
params.reliable[0].maxInstandingPackets = 512;
params.reliable[0].maxOutstandingBytes = 128 * 1024;
params.reliable[0].maxOutstandingBytes = 1 * 1024;
params.reliable[0].congestionWindowMinimum = 50000;
params.reliable[0].maxOutstandingPackets = 512;
params.reliable[0].processOnSend = false;
@@ -1415,8 +1415,6 @@ static void commandFuncAuctionBid(Command const &, NetworkId const &actor, Netwo
CommoditiesMarket::getAuctionDetails(*actorCreature, auctionId);
return;
if (actorCreature)
{
CommoditiesMarket::auctionBid(
@@ -12,7 +12,7 @@
#include "serverGame/CreatureObject.h"
#include <cstdio>
#include <hash_set>
#include <unordered_set>
// ======================================================================
@@ -1999,6 +1999,7 @@ ShipComponentData * ShipObject::createShipComponentData (int chassisSlot) const
if (shipComponentData == NULL)
{
WARNING (true, ("ShipObject::createShipComponentData failed for slot [%d] ship Component data could not be constructed", chassisSlot));
delete(shipComponentData);
return NULL;
}
@@ -706,7 +706,7 @@ const Region * RegionMaster::addDynamicRegion(const UniverseObject & source)
DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has unknown "
"geometry type", source.getNetworkId().getValueString().c_str(),
geometry));
return false;
return NULL;
}
if (region == NULL)
{
@@ -235,13 +235,13 @@ ShipInternalDamageOverTime const * const ShipInternalDamageOverTimeManager::find
//-- there is no lower bound, the idot is not in the vector
if (lowerBound == s_idotVector.end())
return false;
return NULL;
ShipInternalDamageOverTime & lowerBoundIdot = *lowerBound;
//-- the lower bound sorts greater than the new idot, therefore this is a new insertion
if (idot < lowerBoundIdot)
return false;
return NULL;
return &lowerBoundIdot;
}
@@ -1121,7 +1121,7 @@ jobject JNICALL ScriptMethodsDataTableNamespace::dataTableGetRow(JNIEnv *env, jo
LocalRefPtr target = createNewObject(JavaLibrary::getClsDictionary(), JavaLibrary::getMidDictionary());
if (target == LocalRef::cms_nullPtr)
return false;
return JNI_FALSE;
for (int i = 0; i < dt->getNumColumns(); ++i)
{
@@ -1339,7 +1339,7 @@ jstring JNICALL ScriptMethodsShipNamespace::getShipComponentName(JNIEnv * env, j
{
ShipObject const * const shipObject = JavaLibrary::getShipThrow(env, jobject_shipId, "getShipComponentName() invalid ship", false);
if (!shipObject)
return false;
return NULL;
Unicode::String const & name = shipObject->getComponentName(chassisSlot);
if (!name.empty())
@@ -4073,7 +4073,7 @@ jlongArray JNICALL ScriptMethodsShipNamespace::getShipCargoHoldContentsResourceT
{
ShipObject const * const shipObject = getShipThrowTestSlot(env, jobject_shipId, "getShipCargoHoldContents()", false, static_cast<int>(ShipChassisSlotType::SCST_cargo_hold));
if (!shipObject)
return false;
return NULL;
ShipObject::NetworkIdIntMap const & contents = shipObject->getCargoHoldContents();
@@ -4099,7 +4099,7 @@ jintArray JNICALL ScriptMethodsShipNamespace::getShipCargoHoldContentsAmounts(JN
{
ShipObject const * const shipObject = getShipThrowTestSlot(env, jobject_shipId, "getShipCargoHoldContents()", false, static_cast<int>(ShipChassisSlotType::SCST_cargo_hold));
if (!shipObject)
return false;
return NULL;
ShipObject::NetworkIdIntMap const & contents = shipObject->getCargoHoldContents();
@@ -74,7 +74,7 @@ void GameScheduler::remove()
DEBUG_FATAL(!s_installed, ("GameScheduler not installed."));
delete s_scheduler;
s_scheduler = false;
s_scheduler = NULL;
s_installed = false;
}
@@ -518,12 +518,12 @@ void ConfigSharedNetwork::install(int newClockSyncDelay)
KEY_INT (incomingBufferSize, 4 * 1024 * 1024);
KEY_INT (outgoingBufferSize, 4 * 1024 * 1024);
KEY_INT (maxConnections, 1000);
KEY_INT (maxRawPacketSize, 496);
KEY_INT (maxRawPacketSize, 1460);
KEY_INT (maxInstandingPackets, 400);
KEY_INT (maxOutstandingBytes, 200 * 1024);
KEY_INT (maxOutstandingBytes, 1 * 1024);
KEY_INT (maxOutstandingPackets, 400);
KEY_BOOL (processOnSend, false);
KEY_BOOL (processIcmpErrors, true);
KEY_BOOL (processIcmpErrors, false);
KEY_INT (fragmentSize, 496);
KEY_INT (pooledPacketMax, 1024);
KEY_INT (pooledPacketSize, -1);
@@ -555,7 +555,7 @@ void ConfigSharedNetwork::install(int newClockSyncDelay)
KEY_BOOL (allowPortRemapping, true);
KEY_BOOL (useTcp, true);
KEY_INT (tcpMinimumFrame, 1000);
KEY_BOOL (reportUdpDisconnects, false);
KEY_BOOL (reportUdpDisconnects, true);
KEY_BOOL (reportTcpDisconnects, true);
KEY_BOOL (logConnectionConstructionDestruction, false);
KEY_BOOL (logConnectionOpenedClosed, false);
@@ -318,7 +318,7 @@ void NetworkHandler::onTerminate(void * m, UdpConnectionMT * u)
{
if(m)
{
// NetworkHandler * s = reinterpret_cast<NetworkHandler *>(m);
NetworkHandler * s = reinterpret_cast<NetworkHandler *>(m);
if(u)
{
u->AddRef();
@@ -562,7 +562,7 @@ class UdpManager : public UdpGuardedRefCount
typedef UdpParams Params; // DEPRECATED: in here for backwards compatibility
enum { cProtocolVersion = 2 }; // protocol version must match on both ends, or connect packets are simply ignored by the server
enum { cHardMaxRawPacketSize = 8192 };
enum { cHardMaxRawPacketSize = 1460 };
enum { cHardMaxOutstandingPackets = 30000 }; // don't change this
UdpManager(const UdpParams *params);
@@ -1076,7 +1076,7 @@ inline UdpParams::UdpParams(ManagerRole role)
packetHistoryMax = 4;
maxDataHoldTime = 50;
maxDataHoldSize = -1;
maxRawPacketSize = 512;
maxRawPacketSize = 1460;
hashTableSize = 100;
avoidPriorityQueue = false;
clockSyncDelay = 0;
@@ -1113,7 +1113,7 @@ inline UdpParams::UdpParams(ManagerRole role)
userSuppliedEncryptExpansionBytes2 = 0;
reliable[0].maxInstandingPackets = 400;
reliable[0].maxOutstandingBytes = 200 * 1024;
reliable[0].maxOutstandingBytes = 1 * 1024;
reliable[0].maxOutstandingPackets = 400;
reliable[0].outOfOrder = false;
reliable[0].coalesce = true;
@@ -1143,7 +1143,7 @@ inline UdpParams::UdpParams(ManagerRole role)
pooledPacketInitial = 1000;
allowPortRemapping = false;
reliable[0].maxInstandingPackets = 1000;
reliable[0].maxOutstandingBytes = 1024 * 1024;
reliable[0].maxOutstandingBytes = 1 * 1024;
reliable[0].maxOutstandingPackets = 1000;
reliable[0].congestionWindowMinimum = 8192;
reliable[0].resendDelayAdjust = 150;
@@ -1162,7 +1162,7 @@ inline UdpParams::UdpParams(ManagerRole role)
pooledPacketInitial = 100;
allowPortRemapping = false;
reliable[0].maxInstandingPackets = 1000;
reliable[0].maxOutstandingBytes = 1024 * 1024;
reliable[0].maxOutstandingBytes = 1 * 1024;
reliable[0].maxOutstandingPackets = 1000;
reliable[0].congestionWindowMinimum = 8192;
reliable[0].resendDelayAdjust = 150;
@@ -1204,7 +1204,7 @@ inline UdpParams::UdpParams(ManagerRole role)
incomingLogicalPacketMax = 200 * 1024 * 1024;
callbackEventPoolMax = 50000;
reliable[0].maxInstandingPackets = 32000;
reliable[0].maxOutstandingBytes = 50 * 1024 * 1024;
reliable[0].maxOutstandingBytes = 1 * 1024;
reliable[0].maxOutstandingPackets = 32000;
reliable[0].congestionWindowMinimum = 300000;
reliable[0].toleranceLossCount = 100;
@@ -169,7 +169,7 @@ namespace API_NAMESPACE
params.allowPortRemapping = false; // set to false (optional)
params.oldestUnacknowledgedTimeout = 15 * 1000; // set to 30000 (longer for debugging tolerance)
params.maxDataHoldTime = 0; // set to 0 (this is critical)
params.reliable[0].maxOutstandingBytes = 2 * 1024 * 1024; // set to 2mb
params.reliable[0].maxOutstandingBytes = 1 * 1024; // set to 2mb
params.reliable[0].maxOutstandingPackets = 4000; // set to 4000
params.reliable[0].resendDelayAdjust = 1500; // set to 1500
params.reliable[0].congestionWindowMinimum = 50000; // set to 50000
@@ -140,7 +140,7 @@ namespace NAMESPACE
params.allowPortRemapping = false; // set to false (optional)
params.oldestUnacknowledgedTimeout = 15 * 1000; // set to 30000 (longer for debugging tolerance)
params.maxDataHoldTime = 0; // set to 0 (this is critical)
params.reliable[0].maxOutstandingBytes = 2 * 1024 * 1024; // set to 2mb
params.reliable[0].maxOutstandingBytes = 1 * 1024; // set to 2mb
params.reliable[0].maxOutstandingPackets = 4000; // set to 4000
params.reliable[0].resendDelayAdjust = 1500; // set to 1500
params.reliable[0].congestionWindowMinimum = 50000; // set to 50000
@@ -169,7 +169,7 @@ UdpManager::Params::Params()
packetHistoryMax = 100;
maxDataHoldTime = 50;
maxDataHoldSize = -1;
maxRawPacketSize = 512;
maxRawPacketSize = 1460;
hashTableSize = 100;
avoidPriorityQueue = false;
clockSyncDelay = 0;
@@ -207,7 +207,7 @@ UdpManager::Params::Params()
simulateOutgoingOverloadLevel = 0;
reliable[0].maxInstandingPackets = 400;
reliable[0].maxOutstandingBytes = 200 * 1024;
reliable[0].maxOutstandingBytes = 1 * 1024;
reliable[0].maxOutstandingPackets = 400;
reliable[0].outOfOrder = false;
reliable[0].processOnSend = false;
@@ -443,7 +443,7 @@ class UdpManager
enum { cReliableChannelCount = 4 };
enum { cEncryptPasses = 2 };
enum { cProtocolVersion = 2 }; // protocol version must match on both ends, or connect packets are simply ignored by the server
enum { cHardMaxRawPacketSize = 16384 };
enum { cHardMaxRawPacketSize = 1460 };
enum { cHardMaxOutstandingPackets = 30000 }; // don't change this
struct ReliableConfig
+2 -2
View File
@@ -163,7 +163,7 @@ UdpManager::Params::Params()
packetHistoryMax = 100;
maxDataHoldTime = 50;
maxDataHoldSize = -1;
maxRawPacketSize = 512;
maxRawPacketSize = 1460;
hashTableSize = 100;
avoidPriorityQueue = false;
clockSyncDelay = 0;
@@ -200,7 +200,7 @@ UdpManager::Params::Params()
simulateOutgoingOverloadLevel = 0;
reliable[0].maxInstandingPackets = 400;
reliable[0].maxOutstandingBytes = 200 * 1024;
reliable[0].maxOutstandingBytes = 1 * 1024;
reliable[0].maxOutstandingPackets = 400;
reliable[0].outOfOrder = false;
reliable[0].processOnSend = false;
+1 -1
View File
@@ -441,7 +441,7 @@ class UdpManager
enum { cReliableChannelCount = 4 };
enum { cEncryptPasses = 2 };
enum { cProtocolVersion = 2 }; // protocol version must match on both ends, or connect packets are simply ignored by the server
enum { cHardMaxRawPacketSize = 16384 };
enum { cHardMaxRawPacketSize = 1460 };
enum { cHardMaxOutstandingPackets = 30000 }; // don't change this
struct ReliableConfig
@@ -283,6 +283,7 @@ void verifyUpdateRanges (const char* const filename)
DEBUG_REPORT_LOG (true, ("OK:\t%s\t%s\t%1.1f\n", serverObjectTemplateName, sharedObjectTemplateName.c_str (), farUpdateRange));
objectTemplate->releaseReference ();
}
fclose(infile);
}
static std::string currentLintedAsset;