cpp/openttd-patchpack/source Changeset - r6603:ea06f95493ee

Changeset - r6603:ea06f95493ee

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

peter1138 - 17 years ago 2007-05-10 06:42:43
peter1138@openttd.org

(svn r9818) -Codechange: Cache wagon override sprite set whenever consist is changed, instead of 'recalculating' it every time it is used or just tested.

4 files changed with 15 insertions and 9 deletions:

src/newgrf_engine.cpp

src/newgrf_engine.h

src/train_cmd.cpp

src/vehicle.h

0 comments (0 inline, 0 general)

src/newgrf_engine.cpp

➞

Show inline comments

@@ @@ -63,22 +63,22 @@ void SetWagonOverrideSprites(EngineID en @@
 	memcpy(wo->train_id, train_id, trains);
+}
-static const SpriteGroup *GetWagonOverrideSpriteSet(EngineID engine, CargoID cargo, byte overriding_engine)
 const SpriteGroup *GetWagonOverrideSpriteSet(EngineID engine, CargoID cargo, byte overriding_engine)
+{
 	const WagonOverrides *wos = &_engine_wagon_overrides[engine];
 	int i;
 	/* XXX: This could turn out to be a timesink on profiles. We could
 	 * always just dedicate 65535 bytes for an [engine][train] trampoline
 	 * for O(1). Or O(logMlogN) and searching binary tree or smt. like
 	 * that. --pasky */
 	for (i = 0; i < wos->overrides_count; i++) {
+	for (int i = 0; i < wos->overrides_count; i++) {
 		const WagonOverride *wo = &wos->overrides[i];
 		int j;
 		if (wo->cargo != cargo && wo->cargo != CT_DEFAULT) continue;
 		for (j = 0; j < wo->trains; j++) {
 			if (wo->train_id[j] == overriding_engine && (wo->cargo == cargo || wo->cargo == CT_DEFAULT)) return wo->group;
 		for (int j = 0; j < wo->trains; j++) {
 			if (wo->train_id[j] == overriding_engine) return wo->group;
+		}
+	}
 	return NULL;
@@ @@ -850,8 +850,7 @@ static const SpriteGroup *GetVehicleSpri @@
 		cargo = v->cargo_type;
 		if (v->type == VEH_TRAIN) {
 			group = GetWagonOverrideSpriteSet(engine, cargo, v->u.rail.first_engine);
 			group = v->u.rail.cached_override;
 			if (group != NULL) return group;
+		}
+	}
@@ @@ -912,7 +911,7 @@ SpriteID GetRotorOverrideSprite(EngineID @@
 bool UsesWagonOverride(const Vehicle* v)
+{
 	assert(v->type == VEH_TRAIN);
-	return GetWagonOverrideSpriteSet(v->engine_type, v->cargo_type, v->u.rail.first_engine) != NULL;
+	return v->u.rail.cached_override != NULL;
+}
 /**

src/newgrf_engine.h

➞

Show inline comments

@@ @@ -14,6 +14,7 @@ extern int _traininfo_vehicle_width; @@
 void SetWagonOverrideSprites(EngineID engine, CargoID cargo, const struct SpriteGroup *group, byte *train_id, int trains);
 const SpriteGroup *GetWagonOverrideSpriteSet(EngineID engine, CargoID cargo, byte overriding_engine);
 void SetCustomEngineSprites(EngineID engine, byte cargo, const struct SpriteGroup *group);
 void SetRotorOverrideSprites(EngineID engine, const struct SpriteGroup *group);
 SpriteID GetCustomEngineSprite(EngineID engine, const Vehicle* v, Direction direction);

src/train_cmd.cpp

➞

Show inline comments

@@ @@ -166,6 +166,9 @@ void TrainConsistChanged(Vehicle* v) @@
 		if (IsTrainEngine(u)) first_engine = u->engine_type;
 		/* Cache wagon override sprite group. NULL is returned if there is none */
 		u->u.rail.cached_override = GetWagonOverrideSpriteSet(u->engine_type, u->cargo_type, u->u.rail.first_engine);
 		if (rvi_u->visual_effect != 0) {
 			u->u.rail.cached_vis_effect = rvi_u->visual_effect;
 		} else {

src/vehicle.h

➞

Show inline comments

@@ @@ -141,6 +141,9 @@ struct VehicleRail { @@
 	/* Link between the two ends of a multiheaded engine */
 	Vehicle *other_multiheaded_part;
 	/* Cached wagon override spritegroup */
 	const struct SpriteGroup *cached_override;
 };
 enum {

0 comments (0 inline, 0 general)