cpp/openttd-patchpack/source Changeset - r6822:03c27b6969e3

Changeset - r6822:03c27b6969e3

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

peter1138 - 17 years ago 2007-06-08 06:27:58
peter1138@openttd.org

(svn r10061) -Codechange: [NewGRF] Add common cargo subtype support to vehicle var 42

1 file changed with 15 insertions and 4 deletions:

src/newgrf_engine.cpp

0 comments (0 inline, 0 general)

src/newgrf_engine.cpp

➞

Show inline comments

@@ @@ -528,16 +528,19 @@ static uint32 VehicleGetVariable(const R @@
+			}
 		case 0x42: { // Consist cargo information
 			/* XXX Missing support for common refit cycle and property 25 */
 			const Vehicle *u;
 			byte cargo_classes = 0;
 			uint common_cargo_best = 0;
 			uint common_cargos[NUM_CARGO];
 			uint8 common_cargo_best = 0;
 			uint8 common_cargos[NUM_CARGO];
 			uint8 common_subtype_best = 0;
 			uint8 common_subtypes[256];
 			byte user_def_data = 0;
 			CargoID common_cargo_type = CT_PASSENGERS;
 			uint8 common_subtype = 0;
 			/* Reset our arrays */
 			memset(common_cargos, 0, sizeof(common_cargos));
 			memset(common_subtypes, 0, sizeof(common_subtypes));
 			for (u = v; u != NULL; u = u->next) {
 				/* Skip empty engines */
@@ @@ -546,6 +549,7 @@ static uint32 VehicleGetVariable(const R @@
 				cargo_classes |= GetCargo(u->cargo_type)->classes;
 				common_cargos[u->cargo_type]++;
 				user_def_data |= RailVehInfo(u->engine_type)->user_def_data;
 				common_subtypes[u->cargo_subtype]++;
+			}
 			/* Pick the most common cargo type */
@@ @@ -556,7 +560,14 @@ static uint32 VehicleGetVariable(const R @@
+				}
+			}
 			return cargo_classes | (common_cargo_type << 8) | (user_def_data << 24);
 			for (uint i = 0; i < lengthof(common_subtypes); i++) {
 				if (common_subtypes[i] > common_subtype_best) {
 					common_subtype_best = common_subtypes[i];
 					common_subtype = i;
+				}
+			}
 			return cargo_classes | (common_cargo_type << 8) | (common_subtype << 16) | (user_def_data << 24);
+		}
 		case 0x43: // Player information

0 comments (0 inline, 0 general)