cpp/openttd-patchpack/source Changeset - r8599:42c534166459

Changeset - r8599:42c534166459

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

peter1138 - 16 years ago 2008-02-18 19:20:37
peter1138@openttd.org

(svn r12180) -Fix: Test purchase list loading/loaded sprites instead of unconditionally returning a possibly non-existant sprite.

1 file changed with 5 insertions and 1 deletions:

src/newgrf_engine.cpp

0 comments (0 inline, 0 general)

src/newgrf_engine.cpp

➞

Show inline comments

@@ @@ -756,25 +756,29 @@ static uint32 VehicleGetVariable(const R @@
 	*available = false;
 	return UINT_MAX;
+}
 static const SpriteGroup *VehicleResolveReal(const ResolverObject *object, const SpriteGroup *group)
+{
 	const Vehicle *v = object->u.vehicle.self;
 	uint totalsets;
 	uint set;
 	if (v == NULL) return group->g.real.loading[0];
 	if (v == NULL) {
 		if (group->g.real.num_loading > 0) return group->g.real.loading[0];
 		if (group->g.real.num_loaded  > 0) return group->g.real.loaded[0];
 		return NULL;
+	}
 	bool in_motion = v->First()->current_order.type != OT_LOADING;
 	totalsets = in_motion ? group->g.real.num_loaded : group->g.real.num_loading;
 	if (v->cargo.Count() >= v->cargo_cap || totalsets == 1) {
 		set = totalsets - 1;
 	} else if (v->cargo.Empty() || totalsets == 2) {
 		set = 0;
 	} else {
 		set = v->cargo.Count() * (totalsets - 2) / max((uint16)1, v->cargo_cap) + 1;
+	}

0 comments (0 inline, 0 general)