--- a/newgrf.c	Sat Jan 07 16:30:49 2006 +0000
+++ b/newgrf.c	Sat Jan 07 16:47:59 2006 +0000
@@ -262,9 +262,9 @@
 				uint32 base = grf_load_dword(&buf);
 
 				switch (base) {
-					case 0x4C30: rvi[i].engclass = 0; break;
-					case 0x4C36: rvi[i].engclass = 1; break;
-					case 0x4C3C: rvi[i].engclass = 2; break;
+					case 0x4C30: rvi[i].running_cost_class = 0; break;
+					case 0x4C36: rvi[i].running_cost_class = 1; break;
+					case 0x4C3C: rvi[i].running_cost_class = 2; break;
 				}
 				dewagonize(base, engine + i);
 			}
@@ -291,7 +291,7 @@
 					if (rvi[i].flags & RVI_MULTIHEAD) {
 						// adjust power and running cost if needed
 						rvi[i].power *= 2;
-						rvi[i].running_cost_base /= 2;
+						rvi[i].running_cost_base *= 2;
 					}
 					rvi[i].flags &= ~RVI_MULTIHEAD;
 				}