cpp/openttd-patchpack/source Changeset - r10699:4939ee218211

Changeset - r10699:4939ee218211

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

smatz - 15 years ago 2009-01-12 17:31:43
smatz@openttd.org

(svn r15031) -Fix (r15027): merge reverted r15026, so do it once again

2 files changed with 33 insertions and 5 deletions:

src/core/enum_type.hpp

src/spritecache.cpp

0 comments (0 inline, 0 general)

src/core/enum_type.hpp

➞

Show inline comments

@@ @@ -74,8 +74,7 @@ template <typename Tenum_t> struct TinyE @@
 /** The general declaration of TinyEnumT<> (above) */
 template <typename Tenum_t>
 struct TinyEnumT
+{
 struct TinyEnumT {
 	typedef Tenum_t enum_type;                      ///< expose our enumeration type (i.e. Trackdir) to outside
 	typedef EnumPropsT<Tenum_t> Props;              ///< make easier access to our enumeration propeties
 	typedef typename Props::storage storage_type;   ///< small storage type
@@ @@ -121,4 +120,31 @@ struct TinyEnumT @@
+	}
 };
 #endif /* HELPERS_HPP */
 /** Template of struct holding enum types (on most archs, enums are stored in an int32). No math operators are provided. */
 template <typename enum_type, typename storage_type>
 struct SimpleTinyEnumT {
 	storage_type m_val;  ///< here we hold the actual value in small (i.e. byte) form
 	/** Cast operator - invoked then the value is assigned to the storage_type */
 	FORCEINLINE operator enum_type () const
+	{
 		return (enum_type)this->m_val;
+	}
 	/** Assignment operator (from enum_type) */
 	FORCEINLINE SimpleTinyEnumT &operator = (enum_type e)
+	{
 		this->m_val = (storage_type)e;
 		return *this;
+	}
 	/** Assignment operator (from general uint) */
 	FORCEINLINE SimpleTinyEnumT &operator = (uint u)
+	{
 		this->m_val = (storage_type)u;
 		return *this;
+	}
 };
 #endif /* ENUM_TYPE_HPP */

src/spritecache.cpp

➞

Show inline comments

@@ @@ -17,12 +17,14 @@ @@
 #endif /* WITH_PNG */
 #include "blitter/factory.hpp"
 #include "core/math_func.hpp"
 #include "core/enum_type.hpp"
 #include "table/sprites.h"
 /* Default of 4MB spritecache */
 uint _sprite_cache_size = 4;
 typedef SimpleTinyEnumT<SpriteType, byte> SpriteTypeByte;
 struct SpriteCache {
 	void *ptr;
@@ @@ -30,8 +32,8 @@ struct SpriteCache { @@
 	uint32 id;
 	uint16 file_slot;
 	int16 lru;
 	SpriteType type; ///< In some cases a single sprite is misused by two NewGRFs. Once as real sprite and once as recolour sprite. If the recolour sprite gets into the cache it might be drawn as real sprite which causes enormous trouble.
 	bool warned;     ///< True iff the user has been warned about incorrect use of this sprite
 	SpriteTypeByte type; ///< In some cases a single sprite is misused by two NewGRFs. Once as real sprite and once as recolour sprite. If the recolour sprite gets into the cache it might be drawn as real sprite which causes enormous trouble.
 	bool warned;         ///< True iff the user has been warned about incorrect use of this sprite
 };

0 comments (0 inline, 0 general)