diff --git a/apps/openmw-mp/Script/Functions/Actors.cpp b/apps/openmw-mp/Script/Functions/Actors.cpp index 909d8a3e6..b0040c625 100644 --- a/apps/openmw-mp/Script/Functions/Actors.cpp +++ b/apps/openmw-mp/Script/Functions/Actors.cpp @@ -537,7 +537,7 @@ void ActorFunctions::InitializeActorList(unsigned short pid) noexcept void ActorFunctions::CopyLastActorListToStore() noexcept { - CopyLastActorListToStore(); + CopyReceivedActorListToStore(); } unsigned int ActorFunctions::GetActorRefNumIndex(unsigned int index) noexcept diff --git a/apps/openmw-mp/Script/Functions/Miscellaneous.cpp b/apps/openmw-mp/Script/Functions/Miscellaneous.cpp index d9e55e4c8..1a0aff916 100644 --- a/apps/openmw-mp/Script/Functions/Miscellaneous.cpp +++ b/apps/openmw-mp/Script/Functions/Miscellaneous.cpp @@ -1,38 +1,12 @@ #include "Miscellaneous.hpp" -#include #include -#include #include #include using namespace std; -static std::string tempFilename; - -bool MiscellaneousFunctions::DoesFileExist(const char *filePath) noexcept -{ - return boost::filesystem::exists(filePath); -} - -const char *MiscellaneousFunctions::GetCaseInsensitiveFilename(const char *folderPath, const char *filename) noexcept -{ - if (!boost::filesystem::exists(folderPath)) return "invalid"; - - boost::filesystem::directory_iterator end_itr; // default construction yields past-the-end - - for (boost::filesystem::directory_iterator itr(folderPath); itr != end_itr; ++itr) - { - if (Misc::StringUtils::ciEqual(itr->path().filename().string(), filename)) - { - tempFilename = itr->path().filename().string(); - return tempFilename.c_str(); - } - } - return "invalid"; -} - unsigned int MiscellaneousFunctions::GetLastPlayerId() noexcept { return Players::getLastPlayerId(); @@ -47,13 +21,3 @@ void MiscellaneousFunctions::SetCurrentMpNum(int mpNum) noexcept { mwmp::Networking::getPtr()->setCurrentMpNum(mpNum); } - -void MiscellaneousFunctions::LogMessage(unsigned short level, const char *message) noexcept -{ - LOG_MESSAGE_SIMPLE(level, "[Script]: %s", message); -} - -void MiscellaneousFunctions::LogAppend(unsigned short level, const char *message) noexcept -{ - LOG_APPEND(level, "[Script]: %s", message); -} diff --git a/apps/openmw-mp/Script/Functions/Miscellaneous.hpp b/apps/openmw-mp/Script/Functions/Miscellaneous.hpp index bd3f211c7..96b646579 100644 --- a/apps/openmw-mp/Script/Functions/Miscellaneous.hpp +++ b/apps/openmw-mp/Script/Functions/Miscellaneous.hpp @@ -4,42 +4,15 @@ #include "../Types.hpp" #define MISCELLANEOUSAPI \ - {"DoesFileExist", MiscellaneousFunctions::DoesFileExist},\ - {"GetCaseInsensitiveFilename", MiscellaneousFunctions::GetCaseInsensitiveFilename},\ - \ {"GetLastPlayerId", MiscellaneousFunctions::GetLastPlayerId},\ \ {"GetCurrentMpNum", MiscellaneousFunctions::GetCurrentMpNum},\ - {"SetCurrentMpNum", MiscellaneousFunctions::SetCurrentMpNum},\ - \ - {"LogMessage", MiscellaneousFunctions::LogMessage},\ - {"LogAppend", MiscellaneousFunctions::LogAppend} + {"SetCurrentMpNum", MiscellaneousFunctions::SetCurrentMpNum} class MiscellaneousFunctions { public: - /** - * \brief Check whether a certain file exists. - * - * This will be a case sensitive check on case sensitive filesystems. - * - * Whenever you want to enforce case insensitivity, use GetCaseInsensitiveFilename() instead. - * - * \return Whether the file exists or not. - */ - static bool DoesFileExist(const char *filePath) noexcept; - - /** - * \brief Get the first filename in a folder that has a case insensitive match with the filename - * argument. - * - * This is used to retain case insensitivity when opening data files on Linux. - * - * \return The filename that matches. - */ - static const char *GetCaseInsensitiveFilename(const char *folderPath, const char *filename) noexcept; - /** * \brief Get the last player ID currently connected to the server. * @@ -75,30 +48,6 @@ public: * \return void */ static void SetCurrentMpNum(int mpNum) noexcept; - - /** - * \brief Write a log message with its own timestamp. - * - * It will have "[Script]:" prepended to it so as to mark it as a script-generated log message. - * - * \param level The logging level used (0 for LOG_VERBOSE, 1 for LOG_INFO, 2 for LOG_WARN, - * 3 for LOG_ERROR, 4 for LOG_FATAL). - * \param message The message logged. - * \return void - */ - static void LogMessage(unsigned short level, const char *message) noexcept; - - /** - * \brief Write a log message without its own timestamp. - * - * It will have "[Script]:" prepended to it so as to mark it as a script-generated log message. - * - * \param level The logging level used (0 for LOG_VERBOSE, 1 for LOG_INFO, 2 for LOG_WARN, - * 3 for LOG_ERROR, 4 for LOG_FATAL). - * \param message The message logged. - * \return void - */ - static void LogAppend(unsigned short level, const char *message) noexcept; }; #endif //OPENMW_MISCELLANEOUSAPI_HPP diff --git a/apps/openmw-mp/Script/Functions/Server.cpp b/apps/openmw-mp/Script/Functions/Server.cpp index 95cad4ddd..1e876ac32 100644 --- a/apps/openmw-mp/Script/Functions/Server.cpp +++ b/apps/openmw-mp/Script/Functions/Server.cpp @@ -1,5 +1,6 @@ #include "Server.hpp" +#include #include #include #include @@ -9,6 +10,17 @@ #include #include