--- a/src/newgrf.cpp	Wed Jul 30 17:41:02 2008 +0000
+++ b/src/newgrf.cpp	Wed Jul 30 18:23:12 2008 +0000
@@ -1732,7 +1732,7 @@
 			case 0x08: /* Bit number of cargo */
 				cs->bitnum = grf_load_byte(&buf);
 				if (cs->IsValid()) {
-					cs->grfid = _cur_grffile->grfid;
+					cs->grffile = _cur_grffile;
 					SetBit(_cargo_mask, cid + i);
 				} else {
 					ClrBit(_cargo_mask, cid + i);
@@ -3045,6 +3045,7 @@
 			continue;
 		}
 
+		_water_feature[cf].grffile = _cur_grffile;
 		_water_feature[cf].group = _cur_grffile->spritegroups[groupid];
 	}
 }
@@ -3198,7 +3199,7 @@
 		}
 
 		CargoSpec *cs = &_cargo[cid];
-		cs->grfid = _cur_grffile->grfid;
+		cs->grffile = _cur_grffile;
 		cs->group = _cur_grffile->spritegroups[groupid];
 	}
 }