diff options
Diffstat (limited to 'src/game/base')
| -rw-r--r-- | src/game/base/faction.cc | 9 | ||||
| -rw-r--r-- | src/game/base/faction.h | 12 | 
2 files changed, 3 insertions, 18 deletions
diff --git a/src/game/base/faction.cc b/src/game/base/faction.cc index 512a8c6..ef0a7b6 100644 --- a/src/game/base/faction.cc +++ b/src/game/base/faction.cc @@ -57,7 +57,6 @@ bool Faction::init()  	std::string strvalue;  	float floatvalue;  	math::Color colorvalue; -	bool b = false;  	std::string factionlabel; @@ -102,11 +101,7 @@ bool Faction::init()  				} else if (inifile.got_key_color("colorsecond", colorvalue)) {  					faction->set_color_second(colorvalue);  					continue; -					 -				} else if (inifile.got_key_bool("lawfull", b)) { -					faction->set_lawfull(b); -					continue; -					 +  				} else {  					inifile.unknown_key();  				} @@ -189,7 +184,7 @@ Faction::Faction() :  	faction_color(),  	faction_color_second()   {	 -	faction_lawfull = true; +  }  Faction::~Faction() diff --git a/src/game/base/faction.h b/src/game/base/faction.h index 5469dad..c78c2f2 100644 --- a/src/game/base/faction.h +++ b/src/game/base/faction.h @@ -31,11 +31,7 @@ public:  	inline const math::Color & color_second() const {  		return faction_color_second;  	} -	 -	inline const bool lawfull() const { -		return faction_lawfull; -	} -	 +		  	/**  	 * @brief faction reputation   	 * */ @@ -71,10 +67,6 @@ public:  		faction_color_second.assign(color_second);  	} -	inline void set_lawfull(const bool lawfull) { -		faction_lawfull = lawfull; -	} -	  	/* --- static ----------------------------------------------------- */  	/** @@ -103,8 +95,6 @@ private:  	math::Color		faction_color;  	math::Color		faction_color_second; -	bool			faction_lawfull; -	  	core::Reputation	faction_reputation;  	/* --- static ----------------------------------------------------- */  | 
