(svn r7145) Remove extra semicolons

replace/41b28d7194a279bdc17475d4fbe2ea6ec885a466
tron 18 years ago
parent 2b034d9b5b
commit 55d6c98f89

@ -17,7 +17,7 @@ struct Depot {
DepotID index; DepotID index;
}; };
DECLARE_POOL(Depot, Depot, 3, 8000); DECLARE_POOL(Depot, Depot, 3, 8000)
/** /**
* Check if a depot really exists. * Check if a depot really exists.

@ -11,7 +11,7 @@
static void SpriteGroupPoolCleanBlock(uint start_item, uint end_item); static void SpriteGroupPoolCleanBlock(uint start_item, uint end_item);
static uint _spritegroup_count = 0; static uint _spritegroup_count = 0;
STATIC_POOL(SpriteGroup, SpriteGroup, 4, 8000, NULL, SpriteGroupPoolCleanBlock); STATIC_POOL(SpriteGroup, SpriteGroup, 4, 8000, NULL, SpriteGroupPoolCleanBlock)
static void DestroySpriteGroup(SpriteGroup *group) static void DestroySpriteGroup(SpriteGroup *group)
{ {

@ -18,9 +18,9 @@ protected:
CSuperArray m_a; ///< array of arrays of items CSuperArray m_a; ///< array of arrays of items
public: public:
ST_CONST(int, Tblock_size = Tblock_size_); ///< block size is now visible from outside ST_CONST(int, Tblock_size = Tblock_size_) ///< block size is now visible from outside
ST_CONST(int, Tnum_blocks = Tnum_blocks_); ///< number of blocks is now visible from outside ST_CONST(int, Tnum_blocks = Tnum_blocks_) ///< number of blocks is now visible from outside
ST_CONST(int, Tcapacity = Tblock_size * Tnum_blocks); ///< total max number of items ST_CONST(int, Tcapacity = Tblock_size * Tnum_blocks) ///< total max number of items
/** implicit constructor */ /** implicit constructor */
FORCEINLINE CArrayT() { } FORCEINLINE CArrayT() { }

@ -32,7 +32,7 @@ protected:
} ptr_u; } ptr_u;
public: public:
ST_CONST(int, Ttail_reserve = 4); // four extra bytes will be always allocated and zeroed at the end ST_CONST(int, Ttail_reserve = 4) // four extra bytes will be always allocated and zeroed at the end
FORCEINLINE CBlobBaseSimple() { InitEmpty(); } FORCEINLINE CBlobBaseSimple() { InitEmpty(); }
FORCEINLINE CBlobBaseSimple(const CBlobBaseSimple& src) FORCEINLINE CBlobBaseSimple(const CBlobBaseSimple& src)
@ -169,7 +169,7 @@ public:
typedef Titem_ Titem; typedef Titem_ Titem;
typedef Tbase_ Tbase; typedef Tbase_ Tbase;
ST_CONST(int, Titem_size = sizeof(Titem)); ST_CONST(int, Titem_size = sizeof(Titem))
FORCEINLINE CBlobT() : Tbase() {} FORCEINLINE CBlobT() : Tbase() {}
FORCEINLINE CBlobT(const Tbase& src) : Tbase(src) {assert((RawSize() % Titem_size) == 0);} FORCEINLINE CBlobT(const Tbase& src) : Tbase(src) {assert((RawSize() % Titem_size) == 0);}

@ -24,9 +24,9 @@ struct CFixedSizeArrayT {
// make types and constants visible from outside // make types and constants visible from outside
typedef Titem_ Titem; // type of array item typedef Titem_ Titem; // type of array item
ST_CONST(int, Tcapacity = Tcapacity_); // the array capacity (maximum size) ST_CONST(int, Tcapacity = Tcapacity_) // the array capacity (maximum size)
ST_CONST(int, TitemSize = sizeof(Titem_)); // size of item ST_CONST(int, TitemSize = sizeof(Titem_)) // size of item
ST_CONST(int, ThdrSize = sizeof(CHdr)); // size of header ST_CONST(int, ThdrSize = sizeof(CHdr)) // size of header
/** Default constructor. Preallocate space for items and header, then initialize header. */ /** Default constructor. Preallocate space for items and header, then initialize header. */
CFixedSizeArrayT() CFixedSizeArrayT()

@ -120,8 +120,8 @@ class CHashTableT {
public: public:
typedef Titem_ Titem; // make Titem_ visible from outside of class typedef Titem_ Titem; // make Titem_ visible from outside of class
typedef typename Titem_::Key Tkey; // make Titem_::Key a property of HashTable typedef typename Titem_::Key Tkey; // make Titem_::Key a property of HashTable
ST_CONST(int, Thash_bits = Thash_bits_); // publish num of hash bits ST_CONST(int, Thash_bits = Thash_bits_) // publish num of hash bits
ST_CONST(int, Tcapacity = 1 << Thash_bits); // and num of slots 2^bits ST_CONST(int, Tcapacity = 1 << Thash_bits) // and num of slots 2^bits
protected: protected:
/** each slot contains pointer to the first item in the list, /** each slot contains pointer to the first item in the list,

@ -26,10 +26,10 @@ EXTERN_C_END
FORCEINLINE mask_t operator << (mask_t m, int i) {return (mask_t)(((int)m) << i);} \ FORCEINLINE mask_t operator << (mask_t m, int i) {return (mask_t)(((int)m) << i);} \
FORCEINLINE mask_t operator >> (mask_t m, int i) {return (mask_t)(((int)m) >> i);} FORCEINLINE mask_t operator >> (mask_t m, int i) {return (mask_t)(((int)m) >> i);}
DECLARE_ENUM_AS_BIT_MASK(TrackBits); DECLARE_ENUM_AS_BIT_MASK(TrackBits)
DECLARE_ENUM_AS_BIT_INDEX(Track, TrackBits); DECLARE_ENUM_AS_BIT_INDEX(Track, TrackBits)
DECLARE_ENUM_AS_BIT_MASK(TrackdirBits); DECLARE_ENUM_AS_BIT_MASK(TrackdirBits)
DECLARE_ENUM_AS_BIT_INDEX(Trackdir, TrackdirBits); DECLARE_ENUM_AS_BIT_INDEX(Trackdir, TrackdirBits)
#endif /* TRACK_DIR_HPP */ #endif /* TRACK_DIR_HPP */

@ -59,7 +59,7 @@ YS_DEF_BEGIN
YS_DEF(uint32, rail_longer_platform_per_tile_penalty) ///< penalty for longer station platform than train (per tile) YS_DEF(uint32, rail_longer_platform_per_tile_penalty) ///< penalty for longer station platform than train (per tile)
YS_DEF(uint32, rail_shorter_platform_penalty) ///< penalty for shorter station platform than train YS_DEF(uint32, rail_shorter_platform_penalty) ///< penalty for shorter station platform than train
YS_DEF(uint32, rail_shorter_platform_per_tile_penalty) ///< penalty for shorter station platform than train (per tile) YS_DEF(uint32, rail_shorter_platform_per_tile_penalty) ///< penalty for shorter station platform than train (per tile)
YS_DEF_END; YS_DEF_END
#undef YS_DEF_BEGIN #undef YS_DEF_BEGIN
#undef YS_DEF #undef YS_DEF

Loading…
Cancel
Save