mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-07-22 04:14:04 +00:00
Code Issues Releases Wiki Activity

[General] Move credits integrity error message to new ErrorMessages file

Browse source 
Additionally, use correct log level for credit integrity message on server.
This commit is contained in:
David Cernat 2018-07-16 03:21:14 +03:00
parent 0b5cb15f71
commit 72d286473b
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/openmw-mp/main.cpp
View file

@ -9,6 +9,7 @@
#include <components/settings/settings.hpp> #include <components/settings/settings.hpp>
#include <components/version/version.hpp> #include <components/version/version.hpp>
#include <components/openmw-mp/ErrorMessages.hpp>
#include <components/openmw-mp/Log.hpp> #include <components/openmw-mp/Log.hpp>
#include <components/openmw-mp/NetworkMessages.hpp> #include <components/openmw-mp/NetworkMessages.hpp>
#include <components/openmw-mp/Utils.hpp> #include <components/openmw-mp/Utils.hpp>
@ -216,10 +217,8 @@ int main(int argc, char *argv[])
if (!hasValidCredits) if (!hasValidCredits)
{ {
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "To respect the hard work that has gone into\n" LOG_MESSAGE_SIMPLE(Log::LOG_FATAL, "The server is shutting down");
"creating TES3MP, you are required to keep an unmodified tes3mp-credits file\n" LOG_APPEND(Log::LOG_FATAL, "- %s", TES3MP_CREDITS_ERROR);
"corresponding to this version of the code in the same folder as this\n"
"executable. It can have either an .md or a .txt extension.");
return 1; return 1;
} }

2
components/CMakeLists.txt
View file

@ -146,7 +146,7 @@ add_component_dir (version
) )
add_component_dir (openmw-mp add_component_dir (openmw-mp
Log Utils NetworkMessages Version Log Utils ErrorMessages NetworkMessages Version
) )
add_component_dir (openmw-mp/Base add_component_dir (openmw-mp/Base

9
components/openmw-mp/ErrorMessages.hpp Normal file
View file

@ -0,0 +1,9 @@
#ifndef OPENMW_ERRORMESSAGES_HPP
#define OPENMW_ERRORMESSAGES_HPP
#define TES3MP_CREDITS_ERROR ("To respect the hard work that has gone into creating TES3MP, you are\n"\
"required to keep an unmodified tes3mp-credits file corresponding to this\n"\
"version of the code in the same folder as this executable. It can have either\n"\
"an .md or a .txt extension.")
#endif //OPENMW_ERRORMESSAGES_HPP