cpp/openttd-patchpack/source Changeset - r26038:ced62dd5d288

Changeset - r26038:ced62dd5d288

Parent rev.

Child rev.

[Not reviewed]

master

0 5 0

frosch - 3 years ago 2021-10-22 19:46:55
frosch@openttd.org

Codechange: remove redundant 'info_view' parameter, it can be derived from 'image_type'.

5 files changed with 8 insertions and 7 deletions:

src/aircraft_cmd.cpp

src/aircraft_gui.cpp

src/newgrf_engine.cpp

src/newgrf_engine.h

src/vehicle_gui.cpp

0 comments (0 inline, 0 general)

src/aircraft_cmd.cpp

➞

Show inline comments

@@ @@ -185,13 +185,13 @@ void Aircraft::GetImage(Direction direct @@
 void GetRotorImage(const Aircraft *v, EngineImageType image_type, VehicleSpriteSeq *result)
+{
 	assert(v->subtype == AIR_HELICOPTER);
 	const Aircraft *w = v->Next()->Next();
 	if (is_custom_sprite(v->spritenum)) {
-		GetCustomRotorSprite(v, false, image_type, result);
 		GetCustomRotorSprite(v, image_type, result);
 		if (result->IsValid()) return;
+	}
 	/* Return standard rotor sprites if there are no custom sprites for this helicopter */
 	result->Set(SPR_ROTOR_STOPPED + w->state);
+}

src/aircraft_gui.cpp

➞

Show inline comments

@@ @@ -97,13 +97,13 @@ void DrawAircraftImage(const Vehicle *v, @@
 	PaletteID pal = (v->vehstatus & VS_CRASHED) ? PALETTE_CRASH : GetVehiclePalette(v);
 	seq.Draw(x, y + y_offs, pal, (v->vehstatus & VS_CRASHED) != 0);
 	if (helicopter) {
 		const Aircraft *a = Aircraft::From(v);
 		VehicleSpriteSeq rotor_seq;
-		GetCustomRotorSprite(a, true, image_type, &rotor_seq);
 		GetCustomRotorSprite(a, image_type, &rotor_seq);
 		if (!rotor_seq.IsValid()) rotor_seq.Set(SPR_ROTOR_STOPPED);
 		heli_offs = ScaleGUITrad(5);
 		rotor_seq.Draw(x, y + y_offs - heli_offs, PAL_NONE, false);
+	}
 	if (v->index == selection) {
 		x += x_offs;

src/newgrf_engine.cpp

➞

Show inline comments

@@ @@ -1100,20 +1100,21 @@ void GetCustomEngineSprite(EngineID engi @@
+		}
 		if (!HasBit(reg100, 31)) break;
+	}
+}
-void GetRotorOverrideSprite(EngineID engine, const struct Aircraft *v, bool info_view, EngineImageType image_type, VehicleSpriteSeq *result)
 void GetRotorOverrideSprite(EngineID engine, const struct Aircraft *v, EngineImageType image_type, VehicleSpriteSeq *result)
+{
 	const Engine *e = Engine::Get(engine);
 	/* Only valid for helicopters */
 	assert(e->type == VEH_AIRCRAFT);
 	assert(!(e->u.air.subtype & AIR_CTOL));
 	bool info_view = image_type != EIT_ON_MAP;
 	VehicleResolverObject object(engine, v, VehicleResolverObject::WO_SELF, info_view, CBID_NO_CALLBACK);
 	result->Clear();
 	uint rotor_pos = v == nullptr || info_view ? 0 : v->Next()->Next()->state;
 	bool sprite_stack = HasBit(e->info.misc_flags, EF_SPRITE_STACK);
 	uint max_stack = sprite_stack ? lengthof(result->seq) : 1;

src/newgrf_engine.h

➞

Show inline comments

@@ @@ -81,15 +81,15 @@ const SpriteGroup *GetWagonOverrideSprit @@
 void SetCustomEngineSprites(EngineID engine, byte cargo, const struct SpriteGroup *group);
 void GetCustomEngineSprite(EngineID engine, const Vehicle *v, Direction direction, EngineImageType image_type, VehicleSpriteSeq *result);
 #define GetCustomVehicleSprite(v, direction, image_type, result) GetCustomEngineSprite(v->engine_type, v, direction, image_type, result)
 #define GetCustomVehicleIcon(et, direction, image_type, result) GetCustomEngineSprite(et, nullptr, direction, image_type, result)
 void GetRotorOverrideSprite(EngineID engine, const struct Aircraft *v, bool info_view, EngineImageType image_type, VehicleSpriteSeq *result);
 #define GetCustomRotorSprite(v, i, image_type, result) GetRotorOverrideSprite(v->engine_type, v, i, image_type, result)
 #define GetCustomRotorIcon(et, image_type, result) GetRotorOverrideSprite(et, nullptr, true, image_type, result)
 void GetRotorOverrideSprite(EngineID engine, const struct Aircraft *v, EngineImageType image_type, VehicleSpriteSeq *result);
 #define GetCustomRotorSprite(v, image_type, result) GetRotorOverrideSprite(v->engine_type, v, image_type, result)
 #define GetCustomRotorIcon(et, image_type, result) GetRotorOverrideSprite(et, nullptr, image_type, result)
 /* Forward declaration of GRFFile, to avoid unnecessary inclusion of newgrf.h
  * elsewhere... */
 struct GRFFile;
 void SetEngineGRF(EngineID engine, const struct GRFFile *file);

src/vehicle_gui.cpp

➞

Show inline comments

@@ @@ -3188,13 +3188,13 @@ void SetMouseCursorVehicle(const Vehicle @@
 		if (total_width >= ScaleGUITrad(2 * (int)VEHICLEINFO_FULL_VEHICLE_WIDTH)) break;
 		PaletteID pal = (v->vehstatus & VS_CRASHED) ? PALETTE_CRASH : GetVehiclePalette(v);
 		VehicleSpriteSeq seq;
 		if (rotor_seq) {
-			GetCustomRotorSprite(Aircraft::From(v), true, image_type, &seq);
 			GetCustomRotorSprite(Aircraft::From(v), image_type, &seq);
 			if (!seq.IsValid()) seq.Set(SPR_ROTOR_STOPPED);
 			y_offset = - ScaleGUITrad(5);
 		} else {
 			v->GetImage(rtl ? DIR_E : DIR_W, image_type, &seq);
+		}

0 comments (0 inline, 0 general)