pick up some stragglers

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

@@ -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

@@ -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

@@ -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

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