--- a/src/newgrf.cpp	Thu Oct 25 02:26:02 2007 +0000
+++ b/src/newgrf.cpp	Thu Oct 25 23:24:28 2007 +0000
@@ -497,6 +497,12 @@
 				rvi->tractive_effort = grf_load_byte(&buf);
 				break;
 
+			case 0x20: // Air drag
+				/** @todo Air drag for trains. */
+				grf_load_byte(&buf);
+				ret = true;
+				break;
+
 			case 0x21: // Shorter vehicle
 				rvi->shorten_factor = grf_load_byte(&buf);
 				break;
@@ -545,12 +551,6 @@
 				ei->base_intro = grf_load_dword(&buf);
 				break;
 
-			case 0x20: // Air drag
-				/** @todo Air drag for trains. */
-				grf_load_byte(&buf);
-				ret = true;
-				break;
-
 			default:
 				ret = true;
 				break;
@@ -638,6 +638,13 @@
 				ei->callbackmask = grf_load_byte(&buf);
 				break;
 
+			case 0x18: // Tractive effort
+			case 0x19: // Air drag
+				/** @todo Tractive effort and air drag for road vehicles. */
+				grf_load_byte(&buf);
+				ret = true;
+				break;
+
 			case 0x1A: // Refit cost
 				ei->refit_cost = grf_load_byte(&buf);
 				break;
@@ -663,13 +670,6 @@
 				ei->base_intro = grf_load_dword(&buf);
 				break;
 
-			case 0x18: // Tractive effort
-			case 0x19: // Air drag
-				/** @todo Tractive effort and air drag for road vehicles. */
-				grf_load_byte(&buf);
-				ret = true;
-				break;
-
 			default:
 				ret = true;
 				break;
@@ -748,6 +748,13 @@
 				ei->refit_cost = grf_load_byte(&buf);
 				break;
 
+			case 0x14: // Ocean speed fraction
+			case 0x15: // Canal speed fraction
+				/** @todo Speed fractions for ships on oceans and canals */
+				grf_load_byte(&buf);
+				ret = true;
+				break;
+
 			case 0x16: // Retire vehicle early
 				ei->retire_early = grf_load_byte(&buf);
 				break;
@@ -769,13 +776,6 @@
 				ei->base_intro = grf_load_dword(&buf);
 				break;
 
-			case 0x14: // Ocean speed fraction
-			case 0x15: // Canal speed fraction
-				/** @todo Speed fractions for ships on oceans and canals */
-				grf_load_byte(&buf);
-				ret = true;
-				break;
-
 			default:
 				ret = true;
 				break;
@@ -1394,6 +1394,12 @@
 				housespec->minimum_life = grf_load_byte(&buf);
 				break;
 
+			case 0x20: { // @todo Cargo acceptance watch list
+				byte count = grf_load_byte(&buf);
+				for (byte j = 0; j < count; j++) grf_load_byte(&buf);
+				ret = true;
+			} break;
+
 			default:
 				ret = true;
 				break;