swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-09-21 06:12:56 -04:00
Code Issues Projects Releases Wiki Activity

pick up some stragglers

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
Download Patch File Download Diff File Expand all files Collapse all files
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");