gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-09 15:41:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r27664) -Codechange: Deduplicate code for animating effect vehicles.

Browse Source
This commit is contained in:
frosch 2016-10-16 14:56:52 +00:00
parent a6d1d128da
commit 7c4e5242ba
1 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/effectvehicle.cpp
View File

@ -22,6 +22,22 @@
#include "safeguards.h" #include "safeguards.h"
/**
* Increment the sprite unless it has reached the end of the animation.
* @param v Vehicle to increment sprite of.
* @param last Last sprite of animation.
* @return true if the sprite was incremented, false if the end was reached.
*/
static bool IncrementSprite(EffectVehicle *v, SpriteID last)
{
if (v->cur_image != last) {
v->cur_image++;
return true;
} else {
return false;
}
}
static void ChimneySmokeInit(EffectVehicle *v) static void ChimneySmokeInit(EffectVehicle *v)
{ {
uint32 r = Random(); uint32 r = Random();
@ -40,9 +56,7 @@ static bool ChimneySmokeTick(EffectVehicle *v)
return false; return false;
} }
if (v->cur_image != SPR_CHIMNEY_SMOKE_7) { if (!IncrementSprite(v, SPR_CHIMNEY_SMOKE_7)) {
v->cur_image++;
} else {
v->cur_image = SPR_CHIMNEY_SMOKE_0; v->cur_image = SPR_CHIMNEY_SMOKE_0;
} }
v->progress = 7; v->progress = 7;
@ -70,9 +84,7 @@ static bool SteamSmokeTick(EffectVehicle *v)
} }
if ((v->progress & 0xF) == 4) { if ((v->progress & 0xF) == 4) {
if (v->cur_image != SPR_STEAM_SMOKE_4) { if (!IncrementSprite(v, SPR_STEAM_SMOKE_4)) {
v->cur_image++;
} else {
delete v; delete v;
return false; return false;
} }
@ -98,13 +110,11 @@ static bool DieselSmokeTick(EffectVehicle *v)
v->z_pos++; v->z_pos++;
v->UpdatePositionAndViewport(); v->UpdatePositionAndViewport();
} else if ((v->progress & 7) == 1) { } else if ((v->progress & 7) == 1) {
if (v->cur_image != SPR_DIESEL_SMOKE_5) { if (!IncrementSprite(v, SPR_DIESEL_SMOKE_5)) {
v->cur_image++;
v->UpdatePositionAndViewport();
} else {
delete v; delete v;
return false; return false;
} }
v->UpdatePositionAndViewport();
} }
return true; return true;
@ -122,13 +132,12 @@ static bool ElectricSparkTick(EffectVehicle *v)
v->progress++; v->progress++;
} else { } else {
v->progress = 0; v->progress = 0;
if (v->cur_image != SPR_ELECTRIC_SPARK_5) {
v->cur_image++; if (!IncrementSprite(v, SPR_ELECTRIC_SPARK_5)) {
v->UpdatePositionAndViewport();
} else {
delete v; delete v;
return false; return false;
} }
v->UpdatePositionAndViewport();
} }
return true; return true;
@ -152,9 +161,7 @@ static bool SmokeTick(EffectVehicle *v)
} }
if ((v->progress & 0xF) == 4) { if ((v->progress & 0xF) == 4) {
if (v->cur_image != SPR_SMOKE_4) { if (!IncrementSprite(v, SPR_SMOKE_4)) {
v->cur_image++;
} else {
delete v; delete v;
return false; return false;
} }
@ -176,13 +183,11 @@ static bool ExplosionLargeTick(EffectVehicle *v)
{ {
v->progress++; v->progress++;
if ((v->progress & 3) == 0) { if ((v->progress & 3) == 0) {
if (v->cur_image != SPR_EXPLOSION_LARGE_F) { if (!IncrementSprite(v, SPR_EXPLOSION_LARGE_F)) {
v->cur_image++;
v->UpdatePositionAndViewport();
} else {
delete v; delete v;
return false; return false;
} }
v->UpdatePositionAndViewport();
} }
return true; return true;
@ -198,9 +203,7 @@ static bool BreakdownSmokeTick(EffectVehicle *v)
{ {
v->progress++; v->progress++;
if ((v->progress & 7) == 0) { if ((v->progress & 7) == 0) {
if (v->cur_image != SPR_BREAKDOWN_SMOKE_3) { if (!IncrementSprite(v, SPR_BREAKDOWN_SMOKE_3)) {
v->cur_image++;
} else {
v->cur_image = SPR_BREAKDOWN_SMOKE_0; v->cur_image = SPR_BREAKDOWN_SMOKE_0;
} }
v->UpdatePositionAndViewport(); v->UpdatePositionAndViewport();
@ -225,13 +228,11 @@ static bool ExplosionSmallTick(EffectVehicle *v)
{ {
v->progress++; v->progress++;
if ((v->progress & 3) == 0) { if ((v->progress & 3) == 0) {
if (v->cur_image != SPR_EXPLOSION_SMALL_B) { if (!IncrementSprite(v, SPR_EXPLOSION_SMALL_B)) {
v->cur_image++;
v->UpdatePositionAndViewport();
} else {
delete v; delete v;
return false; return false;
} }
v->UpdatePositionAndViewport();
} }
return true; return true;