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
@@ -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();