mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-03 13:19:40 +00:00
Code Issues Releases Wiki Activity

[Server] Add and use Utils::getCellFromDescription()

Browse source
This commit is contained in:
David Cernat 2017-04-28 16:33:58 +03:00
parent cc3dfd7da0
commit 9c5eb47e90
4 changed files with 51 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
apps/openmw-mp/Script/Functions/Actors.cpp
View file

@ -1,10 +1,11 @@
#include <regex>
#include <apps/openmw-mp/Player.hpp>
#include <apps/openmw-mp/Script/ScriptFunctions.hpp>
#include <apps/openmw-mp/Networking.hpp>
#include <components/openmw-mp/NetworkMessages.hpp> #include <components/openmw-mp/NetworkMessages.hpp>
#include <components/openmw-mp/Base/BaseActor.hpp> #include <components/openmw-mp/Base/BaseActor.hpp>
#include <apps/openmw-mp/Networking.hpp>
#include <apps/openmw-mp/Player.hpp>
#include <apps/openmw-mp/Utils.hpp>
#include <apps/openmw-mp/Script/ScriptFunctions.hpp>
#include "Actors.hpp" #include "Actors.hpp"
using namespace mwmp; using namespace mwmp;
@ -86,26 +87,7 @@ double ActorFunctions::GetActorRotZ(unsigned int i) noexcept
void ActorFunctions::SetScriptActorListCell(const char* cellDescription) noexcept void ActorFunctions::SetScriptActorListCell(const char* cellDescription) noexcept
{ {
static std::regex exteriorCellPattern("^(-?\\d+), (-?\\d+)$"); scriptActorList.cell = Utils::getCellFromDescription(cellDescription);
std::string description = cellDescription;
std::smatch baseMatch;
if (std::regex_match(description, baseMatch, exteriorCellPattern))
{
scriptActorList.cell.mData.mFlags &= ~ESM::Cell::Interior;
// The first sub match is the whole string, so check for a length of 3
if (baseMatch.size() == 3)
{
scriptActorList.cell.mData.mX = stoi(baseMatch[1].str());
scriptActorList.cell.mData.mY = stoi(baseMatch[2].str());
}
}
else
{
scriptActorList.cell.mData.mFlags |= ESM::Cell::Interior;
scriptActorList.cell.mName = description;
}
} }
void ActorFunctions::SetScriptActorListAction(unsigned char action) noexcept void ActorFunctions::SetScriptActorListAction(unsigned char action) noexcept

32
apps/openmw-mp/Script/Functions/World.cpp
View file

@ -1,10 +1,11 @@
#include <regex>
#include <apps/openmw-mp/Player.hpp>
#include <apps/openmw-mp/Script/ScriptFunctions.hpp>
#include <apps/openmw-mp/Networking.hpp>
#include <components/openmw-mp/NetworkMessages.hpp> #include <components/openmw-mp/NetworkMessages.hpp>
#include <components/openmw-mp/Base/BaseEvent.hpp> #include <components/openmw-mp/Base/BaseEvent.hpp>
#include <apps/openmw-mp/Networking.hpp>
#include <apps/openmw-mp/Player.hpp>
#include <apps/openmw-mp/Utils.hpp>
#include <apps/openmw-mp/Script/ScriptFunctions.hpp>
#include "World.hpp" #include "World.hpp"
using namespace mwmp; using namespace mwmp;
@ -143,26 +144,7 @@ int WorldFunctions::GetContainerItemActionCount(unsigned int objectIndex, unsign
void WorldFunctions::SetScriptEventCell(const char* cellDescription) noexcept void WorldFunctions::SetScriptEventCell(const char* cellDescription) noexcept
{ {
static std::regex exteriorCellPattern("^(-?\\d+), (-?\\d+)$"); scriptEvent.cell = Utils::getCellFromDescription(cellDescription);
std::string description = cellDescription;
std::smatch baseMatch;
if (std::regex_match(description, baseMatch, exteriorCellPattern))
{
scriptEvent.cell.mData.mFlags &= ~ESM::Cell::Interior;
// The first sub match is the whole string, so check for a length of 3
if (baseMatch.size() == 3)
{
scriptEvent.cell.mData.mX = stoi(baseMatch[1].str());
scriptEvent.cell.mData.mY = stoi(baseMatch[2].str());
}
}
else
{
scriptEvent.cell.mData.mFlags |= ESM::Cell::Interior;
scriptEvent.cell.mName = description;
}
} }
void WorldFunctions::SetScriptEventAction(unsigned char action) noexcept void WorldFunctions::SetScriptEventAction(unsigned char action) noexcept

30
apps/openmw-mp/Utils.cpp
View file

@ -23,4 +23,32 @@ const vector<string> Utils::split(const string &str, int delimiter)
result.push_back(move(buffer)); result.push_back(move(buffer));
return result; return result;
} }
ESM::Cell Utils::getCellFromDescription(std::string cellDescription)
{
ESM::Cell cell;
cell.blank();
static std::regex exteriorCellPattern("^(-?\\d+), (-?\\d+)$");
std::smatch baseMatch;
if (std::regex_match(cellDescription, baseMatch, exteriorCellPattern))
{
cell.mData.mFlags &= ~ESM::Cell::Interior;
// The first sub match is the whole string, so check for a length of 3
if (baseMatch.size() == 3)
{
cell.mData.mX = stoi(baseMatch[1].str());
cell.mData.mY = stoi(baseMatch[2].str());
}
}
else
{
cell.mData.mFlags |= ESM::Cell::Interior;
cell.mName = cellDescription;
}
return cell;
}

10
apps/openmw-mp/Utils.hpp
View file

@ -5,10 +5,14 @@
#ifndef OPENMW_UTILS_HPP #ifndef OPENMW_UTILS_HPP
#define OPENMW_UTILS_HPP #define OPENMW_UTILS_HPP
#include <cstddef>
#include <regex>
#include <vector>
#include <components/esm/loadcell.hpp>
#include <components/openmw-mp/Utils.hpp> #include <components/openmw-mp/Utils.hpp>
#include <components/openmw-mp/Log.hpp> #include <components/openmw-mp/Log.hpp>
#include <cstddef>
#include <vector>
#if (!defined(DEBUG_PRINTF) && defined(DEBUG)) #if (!defined(DEBUG_PRINTF) && defined(DEBUG))
#define DEBUG_PRINTF(...) LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, __VA_ARGS__) #define DEBUG_PRINTF(...) LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, __VA_ARGS__)
@ -21,6 +25,8 @@ namespace Utils
{ {
const std::vector<std::string> split(const std::string &str, int delimiter); const std::vector<std::string> split(const std::string &str, int delimiter);
ESM::Cell getCellFromDescription(std::string cellDescription);
template<size_t N> template<size_t N>
constexpr unsigned int hash(const char(&str)[N], size_t I = N) constexpr unsigned int hash(const char(&str)[N], size_t I = N)
{ {