cpp/openttd-patchpack/source Changeset - r7548:e556b2763df1

Changeset - r7548:e556b2763df1

Parent rev.

Child rev.

[Not reviewed]

master

0 8 0

rubidium - 17 years ago 2007-09-09 11:23:49
rubidium@openttd.org

(svn r11068) -Codechange: remove Vehicle::HasFront as all vehicles have the Vehicle::first pointer correctly set.

8 files changed with 5 insertions and 15 deletions:

src/depot_gui.cpp

src/group_cmd.cpp

src/newgrf_engine.cpp

src/order_gui.cpp

src/roadveh.h

src/train.h

src/tunnelbridge_cmd.cpp

src/vehicle.h

0 comments (0 inline, 0 general)

src/depot_gui.cpp

➞

Show inline comments

@@ @@ -474,7 +474,7 @@ static void HandleCloneVehClick(const Ve @@
 	if (v == NULL) return;
-	if (v->HasFront() && !v->IsPrimaryVehicle()) {
 	if (!v->IsPrimaryVehicle()) {
 		v = v->First();
 		/* Do nothing when clicking on a train in depot with no loc attached */
 		if (v->type == VEH_TRAIN && !IsFrontEngine(v)) return;

src/group_cmd.cpp

➞

Show inline comments

@@ @@ -354,7 +354,7 @@ CommandCost CmdSetGroupReplaceProtection @@
  */
 void RemoveVehicleFromGroup(const Vehicle *v)
+{
-	if (!v->IsValid() || !(v->HasFront() && v->IsPrimaryVehicle())) return;
 	if (!v->IsValid() || !v->IsPrimaryVehicle()) return;
 	if (!IsDefaultGroupID(v->group_id)) DecreaseGroupNumVehicle(v->group_id);
+}

src/newgrf_engine.cpp

➞

Show inline comments

@@ @@ -509,8 +509,6 @@ static uint32 VehicleGetVariable(const R @@
 	switch (variable) {
 		case 0x40: // Get length of consist
 		case 0x41: // Get length of same consecutive wagons
 			if (!v->HasFront()) return 1;
+			{
 				const Vehicle* u;
 				byte chain_before = 0;
@@ @@ -832,7 +830,7 @@ static inline void NewVehicleResolver(Re @@
 	res->ResolveReal   = &VehicleResolveReal;
 	res->u.vehicle.self   = v;
-	res->u.vehicle.parent = (v != NULL && v->HasFront()) ? v->First() : v;
 	res->u.vehicle.parent = (v != NULL) ? v->First() : v;
 	res->u.vehicle.self_type = engine_type;

src/order_gui.cpp

➞

Show inline comments

@@ @@ -355,7 +355,7 @@ static bool HandleOrderVehClick(const Ve @@
+{
 	if (u->type != v->type) return false;
-	if (u->HasFront() && !u->IsPrimaryVehicle()) {
 	if (!u->IsPrimaryVehicle()) {
 		u = u->First();
 		if (!u->IsPrimaryVehicle()) return false;
+	}

src/roadveh.h

➞

Show inline comments

@@ @@ -69,7 +69,6 @@ struct RoadVehicle : public Vehicle { @@
 	ExpensesType GetExpenseType(bool income) const { return income ? EXPENSES_ROADVEH_INC : EXPENSES_ROADVEH_RUN; }
 	WindowClass GetVehicleListWindowClass() const { return WC_ROADVEH_LIST; }
 	bool IsPrimaryVehicle() const { return IsRoadVehFront(this); }
 	bool HasFront() const { return true; }
 	int GetImage(Direction direction) const;
 	int GetDisplaySpeed() const { return this->cur_speed * 10 / 32; }
 	int GetDisplayMaxSpeed() const { return this->max_speed * 10 / 32; }

src/train.h

➞

Show inline comments

@@ @@ -296,7 +296,6 @@ struct Train : public Vehicle { @@
 	WindowClass GetVehicleListWindowClass() const { return WC_TRAINS_LIST; }
 	void PlayLeaveStationSound() const;
 	bool IsPrimaryVehicle() const { return IsFrontEngine(this); }
 	bool HasFront() const { return true; }
 	int GetImage(Direction direction) const;
 	int GetDisplaySpeed() const { return this->u.rail.last_speed * 10 / 16; }
 	int GetDisplayMaxSpeed() const { return this->u.rail.cached_max_speed * 10 / 16; }

src/tunnelbridge_cmd.cpp

➞

Show inline comments

@@ @@ -1369,7 +1369,7 @@ static uint32 VehicleEnter_TunnelBridge( @@
 	} else if (IsBridge(tile)) { // XXX is this necessary?
 		DiagDirection dir;
-		if (v->HasFront() && v->IsPrimaryVehicle()) {
 		if (v->IsPrimaryVehicle()) {
 			/* modify speed of vehicle */
 			uint16 spd = _bridge[GetBridgeType(tile)].speed;

src/vehicle.h

➞

Show inline comments

@@ @@ -421,12 +421,6 @@ public: @@
 	virtual bool IsPrimaryVehicle() const { return false; }
 	/**
 	 * Whether this vehicle understands the concept of a front engine, so
 	 * basically, if GetFirstVehicleInChain() can be called for it.
 	 */
 	virtual bool HasFront() const { return false; }
 	/**
 	 * Gets the sprite to show for the given direction
 	 * @param direction the direction the vehicle is facing
 	 * @return the sprite for the given vehicle in the given direction

0 comments (0 inline, 0 general)