mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-06 00:55:50 +00:00
Code Issues Projects Releases Wiki Activity

some cleanup

Browse Source
This commit is contained in:
Marc Zinnschlag 2013-03-15 10:26:04 +01:00
parent 727a598cbe
commit 66a2df68db
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/openmw/mwworld/fallback.cpp
View File

@ -2,6 +2,9 @@
#include "boost/lexical_cast.hpp"
namespace MWWorld
{
Fallback::Fallback(const std::map<std::string,std::string>& fallback):mFallbackMap(fallback)
{}
std::string Fallback::getFallbackString(const std::string& fall) const
{
std::map<std::string,std::string>::const_iterator it;
@ -14,7 +17,7 @@ namespace MWWorld
float Fallback::getFallbackFloat(const std::string& fall) const
{
std::string fallback=getFallbackString(fall);
if(fallback=="")
if(fallback.empty())
return 0;
else
return boost::lexical_cast<float>(fallback);
@ -22,7 +25,7 @@ namespace MWWorld
bool Fallback::getFallbackBool(const std::string& fall) const
{
std::string fallback=getFallbackString(fall);
if(fallback=="")
if(fallback.empty())
return false;
else
return boost::lexical_cast<bool>(fallback);
@ -30,13 +33,13 @@ namespace MWWorld
Ogre::ColourValue Fallback::getFallbackColour(const std::string& fall) const
{
std::string sum=getFallbackString(fall);
if(sum=="")
if(sum.empty())
return Ogre::ColourValue(0,0,0);
else
{
std::string ret[3];
unsigned int j=0;
for(unsigned int i=0;i<sum.length();i++){
for(unsigned int i=0;i<sum.length();++i){
if(sum[i]==',') j++;
else ret[j]+=sum[i];
}

7
apps/openmw/mwworld/fallback.hpp
View File

@ -1,13 +1,18 @@
#ifndef GAME_MWWORLD_FALLBACK_H
#define GAME_MWWORLD_FALLBACK_H
#include <map>
#include <string>
#include <OgreColourValue.h>
namespace MWWorld
{
class Fallback
{
const std::map<std::string,std::string> mFallbackMap;
public:
Fallback(const std::map<std::string,std::string> fallback):mFallbackMap(fallback){};
Fallback(const std::map<std::string,std::string>& fallback);
std::string getFallbackString(const std::string& fall) const;
float getFallbackFloat(const std::string& fall) const;
bool getFallbackBool(const std::string& fall) const;

1
apps/openmw/mwworld/weather.cpp
View File

@ -12,6 +12,7 @@
#include "player.hpp"
#include "esmstore.hpp"
#include "fallback.hpp"
using namespace Ogre;
using namespace MWWorld;

4
apps/openmw/mwworld/weather.hpp
View File

@ -3,7 +3,7 @@
#include <OgreString.h>
#include <OgreColourValue.h>
#include "fallback.hpp"
namespace MWRender
{
class RenderingManager;
@ -11,6 +11,8 @@ namespace MWRender
namespace MWWorld
{
class Fallback;
/// Defines the actual weather that results from weather setting (see below), time of day and weather transition
struct WeatherResult
{