flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Initial implementation of IniFile overloading

Browse Source
This commit is contained in:
tycho
2015-05-14 15:47:51 +01:00
committed by tycho
parent da58620d45
commit b9efa02c80
22 changed files with 955 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/main.cpp
View File

@@ -2,6 +2,7 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "Root.h"
#include "tclap/CmdLine.h"
#include <exception>
#include <csignal>
@@ -14,7 +15,7 @@
#include "OSSupport/NetworkSingleton.h"
#include "BuildInfo.h"
#include "MemorySettingsRepository.h"
@@ -206,7 +207,7 @@ BOOL CtrlHandler(DWORD fdwCtrlType)
////////////////////////////////////////////////////////////////////////////////
// universalMain - Main startup logic for both standard running and as a service
void universalMain()
void universalMain(std::unique_ptr<cSettingsRepositoryInterface> overridesRepo)
{
#ifdef _WIN32
if (!SetConsoleCtrlHandler((PHANDLER_ROUTINE)CtrlHandler, TRUE))
@@ -226,7 +227,7 @@ void universalMain()
#endif
{
cRoot Root;
Root.Start();
Root.Start(std::move(overridesRepo));
}
#if !defined(ANDROID_NDK)
catch (std::exception & e)
@@ -363,14 +364,39 @@ void WINAPI serviceMain(DWORD argc, TCHAR *argv[])
std::unique_ptr<cMemorySettingsRepository> parseArguments(int argc, char **argv)
{
try
{
TCLAP::CmdLine cmd("MCServer");
TCLAP::ValueArg<int> slotsArg("s", "max-players", "Maximum number of slots for the server to use, overrides setting in setting.ini", false, -1, "number", cmd);
cmd.parse(argc, argv);
int slots = slotsArg.getValue();
auto repo = make_unique<cMemorySettingsRepository>();
repo->SetValueI("Server", "MaxPlayers", slots);
repo->SetReadOnly();
return repo;
}
catch (TCLAP::ArgException &e)
{
printf("error reading command line %s for arg %s", e.error().c_str(), e.argId().c_str());
return nullptr;
}
}
////////////////////////////////////////////////////////////////////////////////
// main:
int main( int argc, char **argv)
int main(int argc, char **argv)
{
UNUSED(argc);
UNUSED(argv);
#if defined(_MSC_VER) && defined(_DEBUG) && defined(ENABLE_LEAK_FINDER)
InitLeakFinder();
@@ -425,6 +451,8 @@ int main( int argc, char **argv)
// DEBUG: test the dumpfile creation:
// *((int *)0) = 0;
auto argsRepo = parseArguments(argc, argv);
// Check if comm logging is to be enabled:
for (int i = 0; i < argc; i++)
{
@@ -483,7 +511,7 @@ int main( int argc, char **argv)
#endif
{
// Not running as a service, do normal startup
universalMain();
universalMain(std::move(argsRepo));
}
#if defined(_MSC_VER) && defined(_DEBUG) && defined(ENABLE_LEAK_FINDER)