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

[Client] Clean up variable & function names in mwmp/Main.cpp

Browse source
This commit is contained in:
David Cernat 2019-04-25 04:29:54 +03:00
parent f6db7d4fc5
commit 437854180c
1 changed files with 24 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
apps/openmw/mwmp/Main.cpp
View file

@ -60,7 +60,7 @@ std::string Main::getResDir()
return resourceDir; return resourceDir;
} }
std::string loadSettings (Settings::Manager & settings) std::string loadSettings(Settings::Manager& settings)
{ {
Files::ConfigurationManager mCfgMgr; Files::ConfigurationManager mCfgMgr;
// Create the settings manager and load default settings file // Create the settings manager and load default settings file
@ -90,7 +90,6 @@ Main::Main()
mLocalPlayer = new LocalPlayer(); mLocalPlayer = new LocalPlayer();
mGUIController = new GUIController(); mGUIController = new GUIController();
mCellController = new CellController(); mCellController = new CellController();
//mLocalPlayer->CharGen(0, 4);
server = "mp.tes3mp.com"; server = "mp.tes3mp.com";
port = 25565; port = 25565;
@ -127,22 +126,22 @@ static Settings::CategorySettingValueMap saveUserSettings;
static Settings::CategorySettingValueMap saveDefaultSettings; static Settings::CategorySettingValueMap saveDefaultSettings;
static Settings::CategorySettingVector saveChangedSettings; static Settings::CategorySettingVector saveChangedSettings;
void InitMgr(Settings::Manager &mgr) void initializeManager(Settings::Manager &manager)
{ {
saveUserSettings = mgr.mUserSettings; saveUserSettings = manager.mUserSettings;
saveDefaultSettings = mgr.mDefaultSettings; saveDefaultSettings = manager.mDefaultSettings;
saveChangedSettings = mgr.mChangedSettings; saveChangedSettings = manager.mChangedSettings;
mgr.mUserSettings.clear(); manager.mUserSettings.clear();
mgr.mDefaultSettings.clear(); manager.mDefaultSettings.clear();
mgr.mChangedSettings.clear(); manager.mChangedSettings.clear();
loadSettings(mgr); loadSettings(manager);
} }
void RestoreMgr(Settings::Manager &mgr) void restoreManager(Settings::Manager &manager)
{ {
mgr.mUserSettings = saveUserSettings; manager.mUserSettings = saveUserSettings;
mgr.mDefaultSettings = saveDefaultSettings; manager.mDefaultSettings = saveDefaultSettings;
mgr.mChangedSettings = saveChangedSettings; manager.mChangedSettings = saveChangedSettings;
} }
bool Main::init(std::vector<std::string> &content, Files::Collections &collections) bool Main::init(std::vector<std::string> &content, Files::Collections &collections)
@ -150,17 +149,17 @@ bool Main::init(std::vector<std::string> &content, Files::Collections &collectio
assert(!pMain); assert(!pMain);
pMain = new Main(); pMain = new Main();
Settings::Manager mgr; Settings::Manager manager;
InitMgr(mgr); initializeManager(manager);
int logLevel = mgr.getInt("logLevel", "General"); int logLevel = manager.getInt("logLevel", "General");
Log::SetLevel(logLevel); Log::SetLevel(logLevel);
if (address.empty()) if (address.empty())
{ {
pMain->server = mgr.getString("destinationAddress", "General"); pMain->server = manager.getString("destinationAddress", "General");
pMain->port = (unsigned short) mgr.getInt("port", "General"); pMain->port = (unsigned short) manager.getInt("port", "General");
serverPassword = mgr.getString("password", "General"); serverPassword = manager.getString("password", "General");
if (serverPassword.empty()) if (serverPassword.empty())
serverPassword = TES3MP_DEFAULT_PASSW; serverPassword = TES3MP_DEFAULT_PASSW;
} }
@ -173,17 +172,17 @@ bool Main::init(std::vector<std::string> &content, Files::Collections &collectio
get().mLocalPlayer->serverPassword = serverPassword; get().mLocalPlayer->serverPassword = serverPassword;
pMain->mNetworking->connect(pMain->server, pMain->port, content, collections); pMain->mNetworking->connect(pMain->server, pMain->port, content, collections);
RestoreMgr(mgr); restoreManager(manager);
return pMain->mNetworking->isConnected(); return pMain->mNetworking->isConnected();
} }
void Main::postInit() void Main::postInit()
{ {
Settings::Manager mgr; Settings::Manager manager;
InitMgr(mgr); initializeManager(manager);
pMain->mGUIController->setupChat(mgr); pMain->mGUIController->setupChat(manager);
RestoreMgr(mgr); restoreManager(manager);
const MWBase::Environment &environment = MWBase::Environment::get(); const MWBase::Environment &environment = MWBase::Environment::get();
environment.getStateManager()->newGame(true); environment.getStateManager()->newGame(true);