mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-03 23:19:41 +00:00
Code Issues Releases Wiki Activity

typo; World::getFallback(std::string key, std::string def)

Browse source
This commit is contained in:
Sebastian Wick 2012-04-04 16:15:15 +02:00
parent 16e7bf353a
commit 48b7b03453
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/main.cpp
View file

@ -71,7 +71,7 @@ void validate(boost::any &v, std::vector<std::string> const &tokens, FallbackMap
for(std::vector<std::string>::const_iterator it=tokens.begin(); it != tokens.end(); it++) for(std::vector<std::string>::const_iterator it=tokens.begin(); it != tokens.end(); it++)
{ {
int sep = it->find(","); int sep = it->find(",");
if(sep < 1 || sep = it->length()-1) if(sep < 1 || sep == (it->length()-1))
throw boost::program_options::validation_error(boost::program_options::validation_error::invalid_option_value); throw boost::program_options::validation_error(boost::program_options::validation_error::invalid_option_value);
std::string key(it->substr(0,sep)); std::string key(it->substr(0,sep));

7
apps/openmw/mwworld/world.cpp
View file

@ -158,11 +158,16 @@ namespace MWWorld
} }
std::string World::getFallback(std::string key) std::string World::getFallback(std::string key)
{
return getFallback(key, "");
}
std::string World::getFallback(std::string key, std::string def)
{ {
std::map<std::string,std::string>::iterator it; std::map<std::string,std::string>::iterator it;
if((it = mFallback.find(key)) == mFallback.end()) if((it = mFallback.find(key)) == mFallback.end())
{ {
return std::string(""); return def;
} }
return it->second; return it->second;
} }

2
apps/openmw/mwworld/world.hpp
View file

@ -130,6 +130,8 @@ namespace MWWorld
std::string getFallback(std::string key); std::string getFallback(std::string key);
std::string getFallback(std::string key, std::string def);
MWWorld::Player& getPlayer(); MWWorld::Player& getPlayer();
const ESMS::ESMStore& getStore() const; const ESMS::ESMStore& getStore() const;