cpp/openttd-patchpack/source Changeset - r2238:dce04584fd24

Changeset - r2238:dce04584fd24

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

tron - 19 years ago 2005-07-30 09:29:20
tron@openttd.org

(svn r2758) Add the AB() macro to add a value to a bit range and use it in a few places, also make use of GB and SB nearby

3 files changed with 9 insertions and 16 deletions:

macros.h

town_cmd.c

tree_cmd.c

0 comments (0 inline, 0 general)

macros.h

➞

Show inline comments

@@ @@ -143,14 +143,16 @@ static inline void swap_tile(TileIndex * @@
 		return ((const byte*)b)[0] + (((const byte*)b)[1] << 8);
+	}
 #endif
 /// Fetch n bits starting at bit s from x
 #define GB(x, s, n) (((x) >> (s)) & ((1 << (n)) - 1))
-/// Set n bits in x starting at bit s to d
+/// Set n bits starting at bit s in x to d
 #define SB(x, s, n, d) ((x) = ((x) & ~(((1 << (n)) - 1) << (s))) | ((d) << (s)))
 /// Add i to the n bits starting at bit s in x
 #define AB(x, s, n, i) ((x) = ((x) & ~(((1 << (n)) - 1) << (s))) | (((x) + ((i) << (s))) & (((1 << (n)) - 1) << (s))))
 /**
  * ROtate x Left/Right by n (must be >= 0)
  * @note Assumes a byte has 8 bits
  */
 #define ROL(x, n) ((x) << (n) | (x) >> (sizeof(x) * 8 - (n)))

town_cmd.c

➞

Show inline comments

@@ @@ -177,13 +177,13 @@ static void AnimateTile_Town(TileIndex t @@
 		_m[tile].owner |= 0x80;
 		do {
 			i = (Random()&7) - 1;
 		} while (i < 0 || i == 1 || i*6==old);
-		_m[tile].m5 = (_m[tile].m5 & ~0x3F) | i;
+		SB(_m[tile].m5, 0, 6, i);
+	}
 	a = _m[tile].owner&0x7F;
 	b = (_m[tile].m5&0x3F) * 6;
 	a += (a < b) ? 1 : -1;
 	_m[tile].owner = (_m[tile].owner&0x80)|a;
@@ @@ -252,24 +252,18 @@ uint32 GetWorldPopulation(void) @@
+	}
 	return pop;
+}
 static void MakeSingleHouseBigger(TileIndex tile)
+{
 	byte b;
 	assert(IsTileType(tile, MP_HOUSE));
 	b = _m[tile].m5;
 	if (b & 0x80)
 		return;
 	if (_m[tile].m5 & 0x80) return;
 	_m[tile].m5 = (b & 0xC0) | ((b+1)&7);
 	if ((_m[tile].m5&7) != 0)
 		return;
 	AB(_m[tile].m5, 0, 3, 1);
 	if (GB(_m[tile].m5, 0, 3) != 0) return;
 	_m[tile].m3 = _m[tile].m3 + 0x40;
 	if ( (_m[tile].m3 & 0xC0) == 0xC0) {
 		ChangePopulation(GetTown(_m[tile].m2), _housetype_population[_m[tile].m4]);
+	}

tree_cmd.c

➞

Show inline comments

@@ @@ -482,17 +482,14 @@ static void TileLoop_Trees(TileIndex til @@
 		TileLoopTreesAlps(tile);
+	}
 	TileLoopClearHelper(tile);
 	/* increase counter */
+	{
 		uint16 m2 = _m[tile].m2;
 		_m[tile].m2 = m2 = (m2 & 0xF0) | ((m2 + 1) & 0xF);
 		if ((m2 & 0xF) != 0) return;
+	}
 	AB(_m[tile].m2, 0, 4, 1);
 	if (GB(_m[tile].m2, 0, 4) != 0) return;
 	m5 = _m[tile].m5;
 	if (GB(m5, 0, 3) == 3) {
 		/* regular sized tree */
 		if (_opt.landscape == LT_DESERT && _m[tile].m3 != 0x1B && GetMapExtraBits(tile) == 1) {
 			m5++; /* start destructing */

0 comments (0 inline, 0 general)