teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

fixed compile problem (gcc related?)

Browse source
This commit is contained in:
Marc Zinnschlag 2010-09-15 22:22:27 +02:00
parent 8de9619579
commit bd983717de
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwgui/window_manager.cpp
View file

@ -178,12 +178,12 @@ void WindowManager::messageBox (const std::string& message, const std::vector<st
} }
} }
const std::string &WindowManager::getGameSettingString(const std::string &id, const std::string &default) const std::string &WindowManager::getGameSettingString(const std::string &id, const std::string &default_)
{ {
const ESM::GameSetting *setting = environment.mWorld->getStore().gameSettings.search(id); const ESM::GameSetting *setting = environment.mWorld->getStore().gameSettings.search(id);
if (setting && setting->type == ESM::VT_String) if (setting && setting->type == ESM::VT_String)
return setting->str; return setting->str;
return default; return default_;
} }
void WindowManager::updateCharacterGeneration() void WindowManager::updateCharacterGeneration()

2
apps/openmw/mwgui/window_manager.hpp
View file

@ -146,7 +146,7 @@ namespace MWGui
* @param id Identifier for the GMST setting, e.g. "aName" * @param id Identifier for the GMST setting, e.g. "aName"
* @param default Default value if the GMST setting cannot be used. * @param default Default value if the GMST setting cannot be used.
*/ */
const std::string &getGameSettingString(const std::string &id, const std::string &default); const std::string &getGameSettingString(const std::string &id, const std::string &default_);
private: private:
void updateCharacterGeneration(); void updateCharacterGeneration();