From ac66e3e28f35c6939d3af68d1f0e26eb9b34e377 Mon Sep 17 00:00:00 2001
From: tron <tron@openttd.org>
Date: Wed, 20 Jul 2005 15:29:28 +0000
Subject: (svn r2650) Convert many explicit shifts+ands to extract bits to
 invocations of GB - should be a bit nicer to read

---
 aircraft_cmd.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'aircraft_cmd.c')

diff --git a/aircraft_cmd.c b/aircraft_cmd.c
index e67e21ad0..d5f9d061b 100644
--- a/aircraft_cmd.c
+++ b/aircraft_cmd.c
@@ -1045,13 +1045,13 @@ static void HandleCrashedAircraft(Vehicle *v)
 
 	if (v->u.air.crashed_counter < 650) {
 		if (CHANCE16R(1,32,r)) {
-			v->direction = (v->direction+_crashed_aircraft_moddir[(r >> 16)&3]) & 7;
+			v->direction = (v->direction + _crashed_aircraft_moddir[GB(r, 16, 2)]) & 7;
 			SetAircraftPosition(v, v->x_pos, v->y_pos, v->z_pos);
 			r = Random();
 			CreateEffectVehicleRel(v,
-				4 + (r&0xF),
-				4 + ((r>>4)&0xF),
-				((r>>8)&0xF),
+				GB(r, 0, 4) + 4,
+				GB(r, 4, 4) + 4,
+				GB(r, 8, 4),
 				EV_EXPLOSION_SMALL);
 		}
 	} else if (v->u.air.crashed_counter >= 10000) {
-- 
cgit v1.2.3-54-g00ecf