marked one more function for inlining...

...and changed it to use a constant instead of a hardcoded value
This commit is contained in:
Mark de Wever 2007-02-08 22:46:12 +00:00
parent c6aeff28d6
commit b6ef0c2c95
2 changed files with 2 additions and 7 deletions

View file

@ -131,12 +131,6 @@ terrain_type::terrain_type(const config& cfg)
}
}
bool terrain_type::is_nonnull() const
{
return (number_ != 0) && (number_ != t_translation::VOID_TERRAIN );
}
void create_terrain_maps(const std::vector<config*>& cfgs,
t_translation::t_list& terrain_list,
std::map<t_translation::t_letter, terrain_type>& letter_to_terrain)

View file

@ -40,7 +40,8 @@ public:
const t_translation::t_list& def_type() const { return def_type_; }
const t_translation::t_list& union_type() const { return union_type_; }
bool is_nonnull() const;
bool is_nonnull() const { return (number_ != t_translation::NONE_TERRAIN) &&
(number_ != t_translation::VOID_TERRAIN ); }
int light_modification() const { return light_modification_; }
int unit_height_adjust() const { return height_adjust_; }