miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openttd updated to 1.5.0-beta2

Browse Source 
--HG--
branch : openttd
This commit is contained in:
Pavel Stupnikov
2015-03-01 00:30:53 +03:00
parent 0abb47ce90
commit d201932121
682 changed files with 26103 additions and 16553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/effectvehicle.cpp
View File

@@ -1,4 +1,4 @@
/* $Id: effectvehicle.cpp 24900 2013-01-08 22:46:42Z planetmaker $ */
/* $Id: effectvehicle.cpp 26863 2014-09-20 15:31:26Z rubidium $ */
/*
* This file is part of OpenTTD.
@@ -19,6 +19,8 @@
#include "effectvehicle_func.h"
#include "effectvehicle_base.h"
#include "safeguards.h"
static void ChimneySmokeInit(EffectVehicle *v)
{
@@ -44,7 +46,7 @@ static bool ChimneySmokeTick(EffectVehicle *v)
v->cur_image = SPR_CHIMNEY_SMOKE_0;
}
v->progress = 7;
VehicleUpdatePositionAndViewport(v);
v->UpdatePositionAndViewport();
}
return true;
@@ -77,7 +79,7 @@ static bool SteamSmokeTick(EffectVehicle *v)
moved = true;
}
if (moved) VehicleUpdatePositionAndViewport(v);
if (moved) v->UpdatePositionAndViewport();
return true;
}
@@ -94,11 +96,11 @@ static bool DieselSmokeTick(EffectVehicle *v)
if ((v->progress & 3) == 0) {
v->z_pos++;
VehicleUpdatePositionAndViewport(v);
v->UpdatePositionAndViewport();
} else if ((v->progress & 7) == 1) {
if (v->cur_image != SPR_DIESEL_SMOKE_5) {
v->cur_image++;
VehicleUpdatePositionAndViewport(v);
v->UpdatePositionAndViewport();
} else {
delete v;
return false;
@@ -122,7 +124,7 @@ static bool ElectricSparkTick(EffectVehicle *v)
v->progress = 0;
if (v->cur_image != SPR_ELECTRIC_SPARK_5) {
v->cur_image++;
VehicleUpdatePositionAndViewport(v);
v->UpdatePositionAndViewport();
} else {
delete v;
return false;
@@ -159,7 +161,7 @@ static bool SmokeTick(EffectVehicle *v)
moved = true;
}
if (moved) VehicleUpdatePositionAndViewport(v);
if (moved) v->UpdatePositionAndViewport();
return true;
}
@@ -176,7 +178,7 @@ static bool ExplosionLargeTick(EffectVehicle *v)
if ((v->progress & 3) == 0) {
if (v->cur_image != SPR_EXPLOSION_LARGE_F) {
v->cur_image++;
VehicleUpdatePositionAndViewport(v);
v->UpdatePositionAndViewport();
} else {
delete v;
return false;
@@ -201,7 +203,7 @@ static bool BreakdownSmokeTick(EffectVehicle *v)
} else {
v->cur_image = SPR_BREAKDOWN_SMOKE_0;
}
VehicleUpdatePositionAndViewport(v);
v->UpdatePositionAndViewport();
}
v->animation_state--;
@@ -225,7 +227,7 @@ static bool ExplosionSmallTick(EffectVehicle *v)
if ((v->progress & 3) == 0) {
if (v->cur_image != SPR_EXPLOSION_SMALL_B) {
v->cur_image++;
VehicleUpdatePositionAndViewport(v);
v->UpdatePositionAndViewport();
} else {
delete v;
return false;
@@ -302,7 +304,7 @@ static bool BulldozerTick(EffectVehicle *v)
return false;
}
}
VehicleUpdatePositionAndViewport(v);
v->UpdatePositionAndViewport();
}
return true;
@@ -475,7 +477,7 @@ static bool BubbleTick(EffectVehicle *v)
if (v->spritenum == 0) {
v->cur_image++;
if (v->cur_image < SPR_BUBBLE_GENERATE_3) {
VehicleUpdatePositionAndViewport(v);
v->UpdatePositionAndViewport();
return true;
}
if (v->animation_substate != 0) {
@@ -521,7 +523,7 @@ static bool BubbleTick(EffectVehicle *v)
v->z_pos += b->z;
v->cur_image = SPR_BUBBLE_0 + b->image;
VehicleUpdatePositionAndViewport(v);
v->UpdatePositionAndViewport();
return true;
}
@@ -605,7 +607,7 @@ EffectVehicle *CreateEffectVehicle(int x, int y, int z, EffectVehicleType type)
_effect_init_procs[type](v);
VehicleUpdatePositionAndViewport(v);
v->UpdatePositionAndViewport();
return v;
}