--- a/src/newgrf.cpp	Thu Aug 16 08:19:52 2007 +0000
+++ b/src/newgrf.cpp	Thu Aug 16 08:21:31 2007 +0000
@@ -2198,33 +2198,31 @@
 
 			case 0x0E: // Define custom layout
 				fsmportspec->copied_layouts = false;
-				{
-					fsmportspec->numlayouts = grf_load_byte(&buf);
-					fsmportspec->size_x = ReallocT(fsmportspec->size_x, fsmportspec->numlayouts);
-					memset(fsmportspec->size_x, 0, fsmportspec->numlayouts);
-					fsmportspec->size_y = ReallocT(fsmportspec->size_y, fsmportspec->numlayouts);
-					memset(fsmportspec->size_y, 0, fsmportspec->numlayouts);
-					fsmportspec->layouts = ReallocT(fsmportspec->layouts, fsmportspec->numlayouts);
-					for (uint set = 0; set < fsmportspec->numlayouts; set++) {
-						byte orientation = grf_load_byte(&buf);
-						byte x = grf_load_byte(&buf);
-						byte y = grf_load_byte(&buf);
-						FSMportsLayout layout;
-
-						if (x == 0 || y == 0) break;
-
-						fsmportspec->size_x[set] = x;
-						fsmportspec->size_y[set] = y;
-
-						layout = MallocT<byte>((x * y) + 2);
-						layout[0] = orientation;
-						layout[1] = grf_load_byte(&buf); //minipic sprite ID
-						for (byte l = 2; l < (x * y) + 2; l++) {
-							layout[l] = grf_load_byte(&buf);
-						}
-
-						fsmportspec->layouts[set] = layout;
+				fsmportspec->numlayouts = grf_load_byte(&buf);
+				fsmportspec->size_x = ReallocT(fsmportspec->size_x, fsmportspec->numlayouts);
+				memset(fsmportspec->size_x, 0, fsmportspec->numlayouts);
+				fsmportspec->size_y = ReallocT(fsmportspec->size_y, fsmportspec->numlayouts);
+				memset(fsmportspec->size_y, 0, fsmportspec->numlayouts);
+				fsmportspec->layouts = ReallocT(fsmportspec->layouts, fsmportspec->numlayouts);
+				for (uint set = 0; set < fsmportspec->numlayouts; set++) {
+					byte orientation = grf_load_byte(&buf);
+					byte x = grf_load_byte(&buf);
+					byte y = grf_load_byte(&buf);
+					FSMportsLayout layout;
+
+					if (x == 0 || y == 0) break;
+
+					fsmportspec->size_x[set] = x;
+					fsmportspec->size_y[set] = y;
+
+					layout = MallocT<byte>((x * y) + 2);
+					layout[0] = orientation;
+					layout[1] = grf_load_byte(&buf); //minipic sprite ID
+					for (byte l = 2; l < (x * y) + 2; l++) {
+						layout[l] = grf_load_byte(&buf);
 					}
+
+					fsmportspec->layouts[set] = layout;
 				}
 				break;
 
@@ -2272,8 +2270,7 @@
 				fsmportspec->portFSM->moving_data = MallocT<AirportMovingData>(fsmportspec->portFSM->nofelements);
 				fsmportspec->portFSM->size_x = fsmportspec->size_x[0];
 				fsmportspec->portFSM->size_y = fsmportspec->size_y[0];
-				for (byte element = 0; element < fsmportspec->portFSM->nofelements; element++)
-				{
+				for (byte element = 0; element < fsmportspec->portFSM->nofelements; element++) {
 					AirportMovingData md;
 					md.x = grf_load_word(&buf);
 					md.y = grf_load_word(&buf);
@@ -2316,31 +2313,26 @@
 					}
 					current->next = NULL;
 				}
-				ret = true;
 				break;
 
 			case 0x1C: // Entry points
 				fsmportspec->portFSM->entry_points = MallocT<byte>(4);
 				//TODO: store entry points
-				for (uint entry = 0; entry < 4; entry++)
-				{
+				for (uint entry = 0; entry < 4; entry++) {
 					fsmportspec->portFSM->entry_points[entry] = grf_load_byte(&buf);
 				}
-				ret = true;
 				break;
 
 			case 0x1D: // Hangar locations
 				fsmportspec->portFSM->nof_depots = grf_load_byte(&buf);
 				fsmportspec->portFSM->airport_depots = MallocT<TileIndexDiffC>(fsmportspec->portFSM->nof_depots);
-				for (uint depot = 0; depot < fsmportspec->portFSM->nof_depots; depot++)
-				{
+				for (uint depot = 0; depot < fsmportspec->portFSM->nof_depots; depot++) {
 					TileIndexDiffC depot_tile;
 					depot_tile.x = grf_load_byte(&buf);
 					depot_tile.y = grf_load_byte(&buf);
 					grf_load_byte(&buf);  //TODO: depot number. for the moment discard. will be used to allow multi-tile depots
 					fsmportspec->portFSM->airport_depots[depot] = depot_tile;
 				}
-				ret = true;
 				break;
 
 			case 0x1E: // Terminal groups
@@ -2348,11 +2340,9 @@
 					uint num_termgroups = grf_load_byte(&buf);
 					fsmportspec->portFSM->terminals = MallocT<byte>(num_termgroups + 1);
 					fsmportspec->portFSM->terminals[0] = num_termgroups;
-					for (uint terms = 0; terms < num_termgroups; terms++)
-					{
+					for (uint terms = 0; terms < num_termgroups; terms++) {
 						fsmportspec->portFSM->terminals[terms + 1] = grf_load_byte(&buf);
 					}
-					ret = true;
 				}
 				break;
 
@@ -2361,22 +2351,18 @@
 					uint num_helipads = grf_load_byte(&buf);
 					fsmportspec->portFSM->helipads = MallocT<byte>(num_helipads + 1);
 					fsmportspec->portFSM->helipads[0] = num_helipads;
-					for (uint helipads = 0; helipads < num_helipads; helipads++)
-					{
+					for (uint helipads = 0; helipads < num_helipads; helipads++) {
 						fsmportspec->portFSM->helipads[helipads + 1] = grf_load_byte(&buf);
 					}
-					ret = true;
 				}
 				break;
 
 			case 0x20: // Port Subtype
 				fsmportspec->portFSM->flags = (AirportFTAClass::Flags)grf_load_byte(&buf);
-				ret = true;
 				break;
 
 			case 0x22: // Catchment Area
 				fsmportspec->portFSM->catchment = grf_load_byte(&buf);
-				ret = true;
 				break;
 
 			case 0x23: // Define placement layout mask