pick up some stragglers

seefoe/src

Fork 0

mirror of https://bitbucket.org/seefoe/src.git synced 2026-07-30 00:15:46 -04:00

Browse Source

This commit is contained in:

DarthArgus

2016-09-29 23:30:03 -05:00

parent 2b2226f6f6

commit 4aa3bdd38a

5 changed files with 16 additions and 7 deletions

									
										engine/server/application/CommoditiesServer/src/shared/Auction.cpp
									
		+4
		-2
	
												View File
												
				@@ -27,6 +27,8 @@

				#include "sharedUtility/DataTable.h"

				#include "sharedUtility/DataTableManager.h"

				#include "sharedFoundation/CrcConstexpr.hpp"

				#include <algorithm>

				// src/engine/client/library/clientGame/src/shared/core/AuctionManagerClient.cpp (s_maxBid)

				@@ -1360,8 +1362,8 @@ void Auction::BuildSearchableAttributeList()

							if (!m_searchableAttributeString)

								m_searchableAttributeString = new std::map<uint32, std::string>;

							static uint32 const shipCertAttributeCrc = Crc::calculate("ship_equipment_certification_search_attribute");

							static uint32 const astromechCertAttributeCrc = Crc::calculate("astromech_certification_search_attribute");

							static uint32 const shipCertAttributeCrc = constcrc("ship_equipment_certification_search_attribute");

							static uint32 const astromechCertAttributeCrc = constcrc("astromech_certification_search_attribute");

							if (itemIsShipComponentOrShipFlightComputer)

							{

									
										engine/server/library/serverGame/src/shared/core/GameServer.cpp
									
		+3
		-1
	
												View File
												
				@@ -230,6 +230,8 @@

				#include "swgSharedUtility/SpeciesRestrictions.h"

				#include "unicodeArchive/UnicodeArchive.h"

				#include "sharedFoundation/CrcConstexpr.hpp"

				#include <limits>

				//-----------------------------------------------------------------------

				@@ -4935,7 +4937,7 @@ void GameServer::handleTeleportMessage(TeleportMessage const &message)

						buf[sizeof(buf)-1] = '\0';

						Command::ErrorCode status = Command::CEC_Success;

						creature->forceExecuteCommand(CommandTable::getCommand(Crc::calculate("planetwarp")), NetworkId::cms_invalid, Unicode::narrowToWide(buf), status, false);

						creature->forceExecuteCommand(CommandTable::getCommand(constcrc("planetwarp")), NetworkId::cms_invalid, Unicode::narrowToWide(buf), status, false);

					}

				}

									
										engine/server/library/serverGame/src/shared/object/IntangibleObject.cpp
									
		+3
		-2
	
												View File
												
				@@ -30,7 +30,6 @@

				#include "serverUtility/ServerClock.h"

				#include "sharedFoundation/Clock.h"

				#include "sharedFoundation/ConstCharCrcLowerString.h"

				#include "sharedFoundation/Crc.h"

				#include "sharedGame/SharedObjectTemplate.h"

				#include "sharedLog/Log.h"

				#include "sharedNetworkMessages/GenericValueTypeMessage.h"

				@@ -39,6 +38,8 @@

				#include "sharedUtility/DataTable.h"

				#include "sharedUtility/DataTableManager.h"

				#include "sharedFoundation/CrcConstexpr.hpp"

				#include <climits>

				// ======================================================================

				@@ -47,7 +48,7 @@ const SharedObjectTemplate * IntangibleObject::m_defaultSharedTemplate = nullptr

				uint32 IntangibleObject::ms_lastFrame = 0;

				uint32 IntangibleObject::ms_theaterTime = 0;

				static const uint32 THEATER_DATATABLE_TAG = Crc::calculate("THEATER");

				static const uint32 THEATER_DATATABLE_TAG = constcrc("THEATER");

				static const std::string THEATER_TEMPLATE("object/intangible/theater/base_theater.iff");

				static const std::string THEATER_FLATTEN_LAYER("terrain/poi_small.lay");

									
										engine/server/library/serverPathfinding/src/shared/ServerPathfindingMessaging.cpp
									
		+3
		-1
	
												View File
												
				@@ -31,6 +31,8 @@

				#include <map>

				#include <set>

				#include "sharedFoundation/CrcConstexpr.hpp"

				ServerPathfindingMessaging * g_messaging = nullptr;

				// ======================================================================

				@@ -195,7 +197,7 @@ void ServerPathfindingMessaging::receiveMessage(const MessageDispatch::Emitter &

							{

								// if there are no waypoints, use the /eject command

								s->asCreatureObject()->commandQueueEnqueue(CommandTable::getCommand(

									Crc::calculate("eject")), NetworkId::cms_invalid, Unicode::String());

									constcrc("eject")), NetworkId::cms_invalid, Unicode::String());

							}

						}

						else

									
										engine/server/library/serverScript/src/shared/ScriptMethodsObjectCreate.cpp
									
		+3
		-1
	
												View File
												
				@@ -47,6 +47,8 @@

				#include "sharedUtility/DataTable.h"

				#include "sharedUtility/DataTableManager.h"

				#include "sharedFoundation/CrcConstexpr.hpp"

				using namespace JNIWrappersNamespace;

				@@ -54,7 +56,7 @@ using namespace JNIWrappersNamespace;

				// constants

				//========================================================================

				static const uint32 THEATER_DATATABLE_TAG = Crc::calculate("THEATER");

				static const uint32 THEATER_DATATABLE_TAG = constcrc("THEATER");

				static const std::string THEATER_TEMPLATE("object/intangible/theater/base_theater.iff");

				static const std::string THEATER_FLATTEN_LAYER("terrain/poi_small.lay");