| author | rubidium |
| Fri, 25 Apr 2008 15:22:32 +0000 | |
| changeset 9055 | 4dc6a0c0ef47 |
| parent 9009 | 6684576ef32b |
| child 9111 | 48ce04029fe4 |
| permissions | -rw-r--r-- |
| 2186 | 1 |
/* $Id$ */ |
2 |
||
|
6423
8e10e79e0fd1
(svn r9559) -Documentation: doxygen and comment changes: 'U' and 'V' now. Almost done. Yeah. I know, I've already said that...
belugas
parents:
6350
diff
changeset
|
3 |
/** @file vehicle.cpp */ |
|
8e10e79e0fd1
(svn r9559) -Documentation: doxygen and comment changes: 'U' and 'V' now. Almost done. Yeah. I know, I've already said that...
belugas
parents:
6350
diff
changeset
|
4 |
|
| 0 | 5 |
#include "stdafx.h" |
|
1891
862800791170
(svn r2397) - CodeChange: rename all "ttd" files to "openttd" files.
Darkvater
parents:
1881
diff
changeset
|
6 |
#include "openttd.h" |
|
3957
25f4a4f22e05
(svn r5116) Move the overly generic GetDepotDirection() from a header to its only consumer
tron
parents:
3953
diff
changeset
|
7 |
#include "road_map.h" |
| 3959 | 8 |
#include "roadveh.h" |
|
3961
9868b766fda7
(svn r5120) Add IsShipInDepot{Stopped,}() and remove some redundant checks
tron
parents:
3959
diff
changeset
|
9 |
#include "ship.h" |
|
1349
15979a2e9001
(svn r1853) Move spritecache function declarations into a header of their own and use SpriteID as parameter type where appropriate
tron
parents:
1328
diff
changeset
|
10 |
#include "spritecache.h" |
|
8119
52b48108425a
(svn r11680) -Codechange: refactor more out of openttd.h and functions.h.
rubidium
parents:
8116
diff
changeset
|
11 |
#include "tile_cmd.h" |
|
6453
226bcddeba32
(svn r9609) -Codechange: Move some function prototypes out of functions.h and into landscape.h, and add a few where they didn't exist.
maedhros
parents:
6444
diff
changeset
|
12 |
#include "landscape.h" |
|
6980
c7c4f3bf5901
(svn r10236) -Feature: Introduce a form of timetabling for vehicles.
maedhros
parents:
6955
diff
changeset
|
13 |
#include "timetable.h" |
|
8224
c5a64d87cc54
(svn r11787) -Codechange: more header rewrites. This time related to viewport.h.
rubidium
parents:
8214
diff
changeset
|
14 |
#include "viewport_func.h" |
|
c5a64d87cc54
(svn r11787) -Codechange: more header rewrites. This time related to viewport.h.
rubidium
parents:
8214
diff
changeset
|
15 |
#include "gfx_func.h" |
|
8763
81fadd257f67
(svn r12459) -Codechange: split news.h into news_type.h and news_func.h.
rubidium
parents:
8736
diff
changeset
|
16 |
#include "news_func.h" |
|
8116
8da76dcb3287
(svn r11677) -Codechange: move price and command related types/functions to their respective places.
rubidium
parents:
8114
diff
changeset
|
17 |
#include "command_func.h" |
| 0 | 18 |
#include "saveload.h" |
|
8254
1496654ca5e7
(svn r11818) -Codechange: split player.h into smaller pieces.
rubidium
parents:
8245
diff
changeset
|
19 |
#include "player_func.h" |
|
1601
83fbe3bfb847
(svn r2105) -Codechange: Added a cache for the first vehicle of a chain to increase performance, especially with many long trains
celestar
parents:
1600
diff
changeset
|
20 |
#include "debug.h" |
|
1752
d65cd19f7117
(svn r2256) - Fix: Trains cannot find a depot when they are in a tunnel. (glx)
matthijs
parents:
1735
diff
changeset
|
21 |
#include "vehicle_gui.h" |
|
8103
cf92483a0abf
(svn r11664) -Codechange: use more specific ("rail_type.h" instead of "rail.h" that includes way more than only "rail_type.h") includes at some places.
rubidium
parents:
8081
diff
changeset
|
22 |
#include "rail_type.h" |
|
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
23 |
#include "train.h" |
|
4662
e36935c7bdde
(svn r6552) -Feature: [depot window] added a "autoreplace all vehicles in depot" button
bjarni
parents:
4659
diff
changeset
|
24 |
#include "aircraft.h" |
|
3428
146dc5f172fc
(svn r4256) - Codechange: Replace lone map access in vehicle.c with its map accessor.
peter1138
parents:
3422
diff
changeset
|
25 |
#include "industry_map.h" |
|
3404
eb8ebfe5df67
(svn r4215) -Codechange: Renamed *RoadStation* functions to *RoadStop* and moved them to station_map.h to keep consistency
celestar
parents:
3393
diff
changeset
|
26 |
#include "station_map.h" |
|
3957
25f4a4f22e05
(svn r5116) Move the overly generic GetDepotDirection() from a header to its only consumer
tron
parents:
3953
diff
changeset
|
27 |
#include "water_map.h" |
|
5469
7edfc643abbc
(svn r7751) -Codechange: move network_* to a new network map. Furthermore move the low level network functions to network/core, so they can be reused by the masterserver and website-serverlist-updater.
rubidium
parents:
5380
diff
changeset
|
28 |
#include "network/network.h" |
|
4130
fd86f49a1e96
(svn r5483) -Fix: [YAPF] desync - for MP games invalidate YAPF cache on every tick to keep it exactly the same on server and clients (it doesn't fix the real source of the problem, but should solve it). Thanks TrueLight for hunting this bug.
KUDr
parents:
4124
diff
changeset
|
29 |
#include "yapf/yapf.h" |
|
5717
b6fb89cd9cce
(svn r8211) -Codechange: (NewGRF) Implement callback 2D, explicit vehicle colour map
peter1138
parents:
5693
diff
changeset
|
30 |
#include "newgrf_callbacks.h" |
|
4603
20c816f664de
(svn r6455) - Feature: Add 2cc (two company colours) livery schemes. This replaces the original colour selection window and bumps the saveload version. Liveries are supported for all vehicles, not just those with 2cc support. Thanks to lakie for GUI inspiration.
peter1138
parents:
4574
diff
changeset
|
31 |
#include "newgrf_engine.h" |
|
4656
9c1d8c4d3e60
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4648
diff
changeset
|
32 |
#include "newgrf_sound.h" |
|
6643
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6641
diff
changeset
|
33 |
#include "group.h" |
|
8784
c2e9d649a9ce
(svn r12488) -Codechange: split order.h into order_base.h and order_func.h.
rubidium
parents:
8763
diff
changeset
|
34 |
#include "order_func.h" |
|
8114
dd6d21dc99c1
(svn r11675) -Codechange: split the string types from the string functions.
rubidium
parents:
8108
diff
changeset
|
35 |
#include "strings_func.h" |
|
8123
ce31d2843a95
(svn r11684) -Codechange: split gfx.h in a type and functional header.
rubidium
parents:
8121
diff
changeset
|
36 |
#include "zoom_func.h" |
|
8131
160939e24ed3
(svn r11692) -Codechange: move some functions from 'functions.h' to a more logical place and remove about 50% of the includes of 'functions.h'
rubidium
parents:
8130
diff
changeset
|
37 |
#include "functions.h" |
|
8140
0d0d8c94f84b
(svn r11702) -Codechange: move all date related stuff to date*.
rubidium
parents:
8139
diff
changeset
|
38 |
#include "date_func.h" |
|
8131
160939e24ed3
(svn r11692) -Codechange: move some functions from 'functions.h' to a more logical place and remove about 50% of the includes of 'functions.h'
rubidium
parents:
8130
diff
changeset
|
39 |
#include "window_func.h" |
|
8144
65cec0877b78
(svn r11706) -Codechange: split vehicle.h and remove another bunch of useless includes.
rubidium
parents:
8140
diff
changeset
|
40 |
#include "vehicle_func.h" |
|
8238
d47a86c79603
(svn r11802) -Fix [FS#716]: do not crash trains when leaving depot to a very long track
smatz
parents:
8230
diff
changeset
|
41 |
#include "signal_func.h" |
|
8157
1505def01945
(svn r11719) -Codechange: split sound.h in a header with types and one with functions.
rubidium
parents:
8144
diff
changeset
|
42 |
#include "sound_func.h" |
|
8211
29a8510dfd62
(svn r11774) -Change: do not include variables.h in a header when it is not needed.
rubidium
parents:
8172
diff
changeset
|
43 |
#include "variables.h" |
|
8212
cf3fce5c7464
(svn r11775) -Codechange: move all autoreplace/autorenew functions to a single location.
rubidium
parents:
8211
diff
changeset
|
44 |
#include "autoreplace_func.h" |
|
cf3fce5c7464
(svn r11775) -Codechange: move all autoreplace/autorenew functions to a single location.
rubidium
parents:
8211
diff
changeset
|
45 |
#include "autoreplace_gui.h" |
|
8214
971f861d5543
(svn r11777) -Codechange: split the string header and make do not include it when it's not necessary.
rubidium
parents:
8212
diff
changeset
|
46 |
#include "string_func.h" |
|
8270
e7c342f6b14c
(svn r11834) -Codechange: only include settings_type.h if needed.
rubidium
parents:
8264
diff
changeset
|
47 |
#include "settings_type.h" |
|
8847
426dd2d582e7
(svn r12599) -Codechange: force AllocateSafeRaw() to be linked to simplify compiler's decisions about inlining
smatz
parents:
8843
diff
changeset
|
48 |
#include "oldpool_func.h" |
|
8962
1b263c69799d
(svn r12754) -Codechange: split depot.h into depot_map.h, depot_func.h and depot_base.h and remove quite a lot of unneeded (before this) includes of depot.h.
rubidium
parents:
8961
diff
changeset
|
49 |
#include "depot_map.h" |
|
9005
d6b0e0a54ef2
(svn r12800) -Codechange: move the animated tile related functions out of texteff.cpp (it isn't a text effect after all). Also remove a few more functions from functions.
rubidium
parents:
8997
diff
changeset
|
50 |
#include "animated_tile_func.h" |
|
9009
6684576ef32b
(svn r12804) -Codechange: move the effect vehicle handling out of vehicle.cpp
rubidium
parents:
9008
diff
changeset
|
51 |
#include "effectvehicle_base.h" |
|
6684576ef32b
(svn r12804) -Codechange: move the effect vehicle handling out of vehicle.cpp
rubidium
parents:
9008
diff
changeset
|
52 |
#include "effectvehicle_func.h" |
| 0 | 53 |
|
|
8264
b1e85998c7d3
(svn r11828) -Codechange: include table/* as the last includes and remove an unneeded include from openttd.h.
rubidium
parents:
8258
diff
changeset
|
54 |
#include "table/sprites.h" |
|
b1e85998c7d3
(svn r11828) -Codechange: include table/* as the last includes and remove an unneeded include from openttd.h.
rubidium
parents:
8258
diff
changeset
|
55 |
#include "table/strings.h" |
|
b1e85998c7d3
(svn r11828) -Codechange: include table/* as the last includes and remove an unneeded include from openttd.h.
rubidium
parents:
8258
diff
changeset
|
56 |
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
57 |
static void ChimneySmokeInit(Vehicle *v) |
| 0 | 58 |
{
|
59 |
uint32 r = Random(); |
|
|
2140
a04d0142ad65
(svn r2650) Convert many explicit shifts+ands to extract bits to invocations of GB - should be a bit nicer to read
tron
parents:
2116
diff
changeset
|
60 |
v->cur_image = SPR_CHIMNEY_SMOKE_0 + GB(r, 0, 3); |
|
a04d0142ad65
(svn r2650) Convert many explicit shifts+ands to extract bits to invocations of GB - should be a bit nicer to read
tron
parents:
2116
diff
changeset
|
61 |
v->progress = GB(r, 16, 3); |
| 0 | 62 |
} |
63 |
||
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
64 |
static void ChimneySmokeTick(Vehicle *v) |
| 0 | 65 |
{
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
66 |
if (v->progress > 0) {
|
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
67 |
v->progress--; |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
68 |
} else {
|
| 0 | 69 |
BeginVehicleMove(v); |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
70 |
|
|
8980
3f434ded0a30
(svn r12772) -Codechange: some vehicle.cpp coding style.
rubidium
parents:
8970
diff
changeset
|
71 |
TileIndex tile = TileVirtXY(v->x_pos, v->y_pos); |
|
1035
812f837ee03f
(svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts
tron
parents:
1024
diff
changeset
|
72 |
if (!IsTileType(tile, MP_INDUSTRY)) {
|
| 0 | 73 |
EndVehicleMove(v); |
|
7398
b933416cf32b
(svn r10770) -Codechange: use the pool item class as super class for the vehicle struct.
rubidium
parents:
7387
diff
changeset
|
74 |
delete v; |
| 0 | 75 |
return; |
76 |
} |
|
77 |
||
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
78 |
if (v->cur_image != SPR_CHIMNEY_SMOKE_7) {
|
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
79 |
v->cur_image++; |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
80 |
} else {
|
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
81 |
v->cur_image = SPR_CHIMNEY_SMOKE_0; |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
82 |
} |
| 0 | 83 |
v->progress = 7; |
84 |
VehiclePositionChanged(v); |
|
85 |
EndVehicleMove(v); |
|
86 |
} |
|
87 |
} |
|
88 |
||
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
89 |
static void SteamSmokeInit(Vehicle *v) |
| 0 | 90 |
{
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
91 |
v->cur_image = SPR_STEAM_SMOKE_0; |
| 0 | 92 |
v->progress = 12; |
93 |
} |
|
94 |
||
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
95 |
static void SteamSmokeTick(Vehicle *v) |
| 0 | 96 |
{
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
97 |
bool moved = false; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
98 |
|
| 0 | 99 |
BeginVehicleMove(v); |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
100 |
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
101 |
v->progress++; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
102 |
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
103 |
if ((v->progress & 7) == 0) {
|
| 0 | 104 |
v->z_pos++; |
105 |
moved = true; |
|
106 |
} |
|
107 |
||
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
108 |
if ((v->progress & 0xF) == 4) {
|
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
109 |
if (v->cur_image != SPR_STEAM_SMOKE_4) {
|
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
110 |
v->cur_image++; |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
111 |
} else {
|
| 0 | 112 |
EndVehicleMove(v); |
|
7398
b933416cf32b
(svn r10770) -Codechange: use the pool item class as super class for the vehicle struct.
rubidium
parents:
7387
diff
changeset
|
113 |
delete v; |
| 0 | 114 |
return; |
115 |
} |
|
116 |
moved = true; |
|
117 |
} |
|
118 |
||
119 |
if (moved) {
|
|
120 |
VehiclePositionChanged(v); |
|
121 |
EndVehicleMove(v); |
|
122 |
} |
|
123 |
} |
|
124 |
||
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
125 |
static void DieselSmokeInit(Vehicle *v) |
| 0 | 126 |
{
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
127 |
v->cur_image = SPR_DIESEL_SMOKE_0; |
| 0 | 128 |
v->progress = 0; |
129 |
} |
|
130 |
||
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
131 |
static void DieselSmokeTick(Vehicle *v) |
| 0 | 132 |
{
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
133 |
v->progress++; |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
134 |
|
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
135 |
if ((v->progress & 3) == 0) {
|
| 0 | 136 |
BeginVehicleMove(v); |
137 |
v->z_pos++; |
|
138 |
VehiclePositionChanged(v); |
|
139 |
EndVehicleMove(v); |
|
140 |
} else if ((v->progress & 7) == 1) {
|
|
141 |
BeginVehicleMove(v); |
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
142 |
if (v->cur_image != SPR_DIESEL_SMOKE_5) {
|
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
143 |
v->cur_image++; |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
144 |
VehiclePositionChanged(v); |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
145 |
EndVehicleMove(v); |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
146 |
} else {
|
| 0 | 147 |
EndVehicleMove(v); |
|
7398
b933416cf32b
(svn r10770) -Codechange: use the pool item class as super class for the vehicle struct.
rubidium
parents:
7387
diff
changeset
|
148 |
delete v; |
| 0 | 149 |
} |
150 |
} |
|
151 |
} |
|
152 |
||
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
153 |
static void ElectricSparkInit(Vehicle *v) |
| 0 | 154 |
{
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
155 |
v->cur_image = SPR_ELECTRIC_SPARK_0; |
| 0 | 156 |
v->progress = 1; |
157 |
} |
|
158 |
||
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
159 |
static void ElectricSparkTick(Vehicle *v) |
| 0 | 160 |
{
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
161 |
if (v->progress < 2) {
|
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
162 |
v->progress++; |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
163 |
} else {
|
| 0 | 164 |
v->progress = 0; |
165 |
BeginVehicleMove(v); |
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
166 |
if (v->cur_image != SPR_ELECTRIC_SPARK_5) {
|
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
167 |
v->cur_image++; |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
168 |
VehiclePositionChanged(v); |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
169 |
EndVehicleMove(v); |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
170 |
} else {
|
| 0 | 171 |
EndVehicleMove(v); |
|
7398
b933416cf32b
(svn r10770) -Codechange: use the pool item class as super class for the vehicle struct.
rubidium
parents:
7387
diff
changeset
|
172 |
delete v; |
| 0 | 173 |
} |
174 |
} |
|
175 |
} |
|
176 |
||
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
177 |
static void SmokeInit(Vehicle *v) |
| 0 | 178 |
{
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
179 |
v->cur_image = SPR_SMOKE_0; |
| 0 | 180 |
v->progress = 12; |
181 |
} |
|
182 |
||
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
183 |
static void SmokeTick(Vehicle *v) |
| 0 | 184 |
{
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
185 |
bool moved = false; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
186 |
|
| 0 | 187 |
BeginVehicleMove(v); |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
188 |
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
189 |
v->progress++; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
190 |
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
191 |
if ((v->progress & 3) == 0) {
|
| 0 | 192 |
v->z_pos++; |
193 |
moved = true; |
|
194 |
} |
|
195 |
||
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
196 |
if ((v->progress & 0xF) == 4) {
|
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
197 |
if (v->cur_image != SPR_SMOKE_4) {
|
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
198 |
v->cur_image++; |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
199 |
} else {
|
| 0 | 200 |
EndVehicleMove(v); |
|
7398
b933416cf32b
(svn r10770) -Codechange: use the pool item class as super class for the vehicle struct.
rubidium
parents:
7387
diff
changeset
|
201 |
delete v; |
| 0 | 202 |
return; |
203 |
} |
|
204 |
moved = true; |
|
205 |
} |
|
206 |
||
207 |
if (moved) {
|
|
208 |
VehiclePositionChanged(v); |
|
209 |
EndVehicleMove(v); |
|
210 |
} |
|
211 |
} |
|
212 |
||
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
213 |
static void ExplosionLargeInit(Vehicle *v) |
| 0 | 214 |
{
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
215 |
v->cur_image = SPR_EXPLOSION_LARGE_0; |
| 0 | 216 |
v->progress = 0; |
217 |
} |
|
218 |
||
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
219 |
static void ExplosionLargeTick(Vehicle *v) |
| 0 | 220 |
{
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
221 |
v->progress++; |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
222 |
if ((v->progress & 3) == 0) {
|
| 0 | 223 |
BeginVehicleMove(v); |
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
224 |
if (v->cur_image != SPR_EXPLOSION_LARGE_F) {
|
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
225 |
v->cur_image++; |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
226 |
VehiclePositionChanged(v); |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
227 |
EndVehicleMove(v); |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
228 |
} else {
|
| 0 | 229 |
EndVehicleMove(v); |
|
7398
b933416cf32b
(svn r10770) -Codechange: use the pool item class as super class for the vehicle struct.
rubidium
parents:
7387
diff
changeset
|
230 |
delete v; |
| 0 | 231 |
} |
232 |
} |
|
233 |
} |
|
234 |
||
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
235 |
static void BreakdownSmokeInit(Vehicle *v) |
| 0 | 236 |
{
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
237 |
v->cur_image = SPR_BREAKDOWN_SMOKE_0; |
| 0 | 238 |
v->progress = 0; |
239 |
} |
|
240 |
||
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
241 |
static void BreakdownSmokeTick(Vehicle *v) |
| 0 | 242 |
{
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
243 |
v->progress++; |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
244 |
if ((v->progress & 7) == 0) {
|
| 0 | 245 |
BeginVehicleMove(v); |
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
246 |
if (v->cur_image != SPR_BREAKDOWN_SMOKE_3) {
|
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
247 |
v->cur_image++; |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
248 |
} else {
|
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
249 |
v->cur_image = SPR_BREAKDOWN_SMOKE_0; |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
250 |
} |
| 0 | 251 |
VehiclePositionChanged(v); |
252 |
EndVehicleMove(v); |
|
253 |
} |
|
254 |
||
|
9008
de19c73e405f
(svn r12803) -Cleanup: rename SpecialVehicle to EffectVehicle to have a uniform naming of the thing instead of using both names for the same thing.
rubidium
parents:
9005
diff
changeset
|
255 |
v->u.effect.animation_state--; |
|
de19c73e405f
(svn r12803) -Cleanup: rename SpecialVehicle to EffectVehicle to have a uniform naming of the thing instead of using both names for the same thing.
rubidium
parents:
9005
diff
changeset
|
256 |
if (v->u.effect.animation_state == 0) {
|
| 0 | 257 |
BeginVehicleMove(v); |
258 |
EndVehicleMove(v); |
|
|
7398
b933416cf32b
(svn r10770) -Codechange: use the pool item class as super class for the vehicle struct.
rubidium
parents:
7387
diff
changeset
|
259 |
delete v; |
| 0 | 260 |
} |
261 |
} |
|
262 |
||
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
263 |
static void ExplosionSmallInit(Vehicle *v) |
| 0 | 264 |
{
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
265 |
v->cur_image = SPR_EXPLOSION_SMALL_0; |
| 0 | 266 |
v->progress = 0; |
267 |
} |
|
268 |
||
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
269 |
static void ExplosionSmallTick(Vehicle *v) |
| 0 | 270 |
{
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
271 |
v->progress++; |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
272 |
if ((v->progress & 3) == 0) {
|
| 0 | 273 |
BeginVehicleMove(v); |
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
274 |
if (v->cur_image != SPR_EXPLOSION_SMALL_B) {
|
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
275 |
v->cur_image++; |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
276 |
VehiclePositionChanged(v); |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
277 |
EndVehicleMove(v); |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
278 |
} else {
|
| 0 | 279 |
EndVehicleMove(v); |
|
7398
b933416cf32b
(svn r10770) -Codechange: use the pool item class as super class for the vehicle struct.
rubidium
parents:
7387
diff
changeset
|
280 |
delete v; |
| 0 | 281 |
} |
282 |
} |
|
283 |
} |
|
284 |
||
|
1364
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
285 |
static void BulldozerInit(Vehicle *v) |
| 0 | 286 |
{
|
|
1364
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
287 |
v->cur_image = SPR_BULLDOZER_NE; |
| 0 | 288 |
v->progress = 0; |
|
9008
de19c73e405f
(svn r12803) -Cleanup: rename SpecialVehicle to EffectVehicle to have a uniform naming of the thing instead of using both names for the same thing.
rubidium
parents:
9005
diff
changeset
|
289 |
v->u.effect.animation_state = 0; |
|
de19c73e405f
(svn r12803) -Cleanup: rename SpecialVehicle to EffectVehicle to have a uniform naming of the thing instead of using both names for the same thing.
rubidium
parents:
9005
diff
changeset
|
290 |
v->u.effect.animation_substate = 0; |
| 0 | 291 |
} |
292 |
||
|
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
293 |
struct BulldozerMovement {
|
|
1365
3ec3ff0adc01
(svn r1869) Fix some bugs in the bulldozer movement implementation.
tron
parents:
1364
diff
changeset
|
294 |
byte direction:2; |
|
1364
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
295 |
byte image:2; |
|
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
296 |
byte duration:3; |
|
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
297 |
}; |
| 0 | 298 |
|
|
1364
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
299 |
static const BulldozerMovement _bulldozer_movement[] = {
|
|
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
300 |
{ 0, 0, 4 },
|
|
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
301 |
{ 3, 3, 4 },
|
|
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
302 |
{ 2, 2, 7 },
|
|
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
303 |
{ 0, 2, 7 },
|
|
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
304 |
{ 1, 1, 3 },
|
|
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
305 |
{ 2, 2, 7 },
|
|
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
306 |
{ 0, 2, 7 },
|
|
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
307 |
{ 1, 1, 3 },
|
|
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
308 |
{ 2, 2, 7 },
|
|
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
309 |
{ 0, 2, 7 },
|
|
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
310 |
{ 3, 3, 6 },
|
|
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
311 |
{ 2, 2, 6 },
|
|
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
312 |
{ 1, 1, 7 },
|
|
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
313 |
{ 3, 1, 7 },
|
|
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
314 |
{ 0, 0, 3 },
|
|
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
315 |
{ 1, 1, 7 },
|
|
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
316 |
{ 3, 1, 7 },
|
|
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
317 |
{ 0, 0, 3 },
|
|
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
318 |
{ 1, 1, 7 },
|
|
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
319 |
{ 3, 1, 7 }
|
| 0 | 320 |
}; |
321 |
||
|
1364
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
322 |
static const struct {
|
|
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
323 |
int8 x; |
|
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
324 |
int8 y; |
|
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
325 |
} _inc_by_dir[] = {
|
|
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
326 |
{ -1, 0 },
|
|
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
327 |
{ 0, 1 },
|
|
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
328 |
{ 1, 0 },
|
|
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
329 |
{ 0, -1 }
|
|
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
330 |
}; |
| 0 | 331 |
|
|
1364
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
332 |
static void BulldozerTick(Vehicle *v) |
| 0 | 333 |
{
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
334 |
v->progress++; |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
335 |
if ((v->progress & 7) == 0) {
|
|
9008
de19c73e405f
(svn r12803) -Cleanup: rename SpecialVehicle to EffectVehicle to have a uniform naming of the thing instead of using both names for the same thing.
rubidium
parents:
9005
diff
changeset
|
336 |
const BulldozerMovement* b = &_bulldozer_movement[v->u.effect.animation_state]; |
| 0 | 337 |
|
338 |
BeginVehicleMove(v); |
|
339 |
||
|
1364
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
340 |
v->cur_image = SPR_BULLDOZER_NE + b->image; |
| 0 | 341 |
|
|
1364
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
342 |
v->x_pos += _inc_by_dir[b->direction].x; |
|
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
343 |
v->y_pos += _inc_by_dir[b->direction].y; |
| 0 | 344 |
|
|
9008
de19c73e405f
(svn r12803) -Cleanup: rename SpecialVehicle to EffectVehicle to have a uniform naming of the thing instead of using both names for the same thing.
rubidium
parents:
9005
diff
changeset
|
345 |
v->u.effect.animation_substate++; |
|
de19c73e405f
(svn r12803) -Cleanup: rename SpecialVehicle to EffectVehicle to have a uniform naming of the thing instead of using both names for the same thing.
rubidium
parents:
9005
diff
changeset
|
346 |
if (v->u.effect.animation_substate >= b->duration) {
|
|
de19c73e405f
(svn r12803) -Cleanup: rename SpecialVehicle to EffectVehicle to have a uniform naming of the thing instead of using both names for the same thing.
rubidium
parents:
9005
diff
changeset
|
347 |
v->u.effect.animation_substate = 0; |
|
de19c73e405f
(svn r12803) -Cleanup: rename SpecialVehicle to EffectVehicle to have a uniform naming of the thing instead of using both names for the same thing.
rubidium
parents:
9005
diff
changeset
|
348 |
v->u.effect.animation_state++; |
|
de19c73e405f
(svn r12803) -Cleanup: rename SpecialVehicle to EffectVehicle to have a uniform naming of the thing instead of using both names for the same thing.
rubidium
parents:
9005
diff
changeset
|
349 |
if (v->u.effect.animation_state == lengthof(_bulldozer_movement)) {
|
| 0 | 350 |
EndVehicleMove(v); |
|
7398
b933416cf32b
(svn r10770) -Codechange: use the pool item class as super class for the vehicle struct.
rubidium
parents:
7387
diff
changeset
|
351 |
delete v; |
| 0 | 352 |
return; |
353 |
} |
|
354 |
} |
|
355 |
VehiclePositionChanged(v); |
|
356 |
EndVehicleMove(v); |
|
357 |
} |
|
358 |
} |
|
359 |
||
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
360 |
static void BubbleInit(Vehicle *v) |
| 0 | 361 |
{
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
362 |
v->cur_image = SPR_BUBBLE_GENERATE_0; |
| 0 | 363 |
v->spritenum = 0; |
364 |
v->progress = 0; |
|
365 |
} |
|
366 |
||
|
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
367 |
struct BubbleMovement {
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
368 |
int8 x:4; |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
369 |
int8 y:4; |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
370 |
int8 z:4; |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
371 |
byte image:4; |
|
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
372 |
}; |
| 0 | 373 |
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
374 |
#define MK(x, y, z, i) { x, y, z, i }
|
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
375 |
#define ME(i) { i, 4, 0, 0 }
|
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
376 |
|
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
377 |
static const BubbleMovement _bubble_float_sw[] = {
|
|
4344
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
378 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
379 |
MK(1, 0, 1, 1), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
380 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
381 |
MK(1, 0, 1, 2), |
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
382 |
ME(1) |
| 0 | 383 |
}; |
384 |
||
385 |
||
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
386 |
static const BubbleMovement _bubble_float_ne[] = {
|
|
4344
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
387 |
MK( 0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
388 |
MK(-1, 0, 1, 1), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
389 |
MK( 0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
390 |
MK(-1, 0, 1, 2), |
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
391 |
ME(1) |
| 0 | 392 |
}; |
393 |
||
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
394 |
static const BubbleMovement _bubble_float_se[] = {
|
|
4344
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
395 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
396 |
MK(0, 1, 1, 1), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
397 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
398 |
MK(0, 1, 1, 2), |
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
399 |
ME(1) |
| 0 | 400 |
}; |
401 |
||
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
402 |
static const BubbleMovement _bubble_float_nw[] = {
|
|
4344
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
403 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
404 |
MK(0, -1, 1, 1), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
405 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
406 |
MK(0, -1, 1, 2), |
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
407 |
ME(1) |
| 0 | 408 |
}; |
409 |
||
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
410 |
static const BubbleMovement _bubble_burst[] = {
|
|
4344
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
411 |
MK(0, 0, 1, 2), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
412 |
MK(0, 0, 1, 7), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
413 |
MK(0, 0, 1, 8), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
414 |
MK(0, 0, 1, 9), |
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
415 |
ME(0) |
| 0 | 416 |
}; |
417 |
||
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
418 |
static const BubbleMovement _bubble_absorb[] = {
|
|
4344
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
419 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
420 |
MK(0, 0, 1, 1), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
421 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
422 |
MK(0, 0, 1, 2), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
423 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
424 |
MK(0, 0, 1, 1), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
425 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
426 |
MK(0, 0, 1, 2), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
427 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
428 |
MK(0, 0, 1, 1), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
429 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
430 |
MK(0, 0, 1, 2), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
431 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
432 |
MK(0, 0, 1, 1), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
433 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
434 |
MK(0, 0, 1, 2), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
435 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
436 |
MK(0, 0, 1, 1), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
437 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
438 |
MK(0, 0, 1, 2), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
439 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
440 |
MK(0, 0, 1, 1), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
441 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
442 |
MK(0, 0, 1, 2), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
443 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
444 |
MK(0, 0, 1, 1), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
445 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
446 |
MK(0, 0, 1, 2), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
447 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
448 |
MK(0, 0, 1, 1), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
449 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
450 |
MK(0, 0, 1, 2), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
451 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
452 |
MK(0, 0, 1, 1), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
453 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
454 |
MK(0, 0, 1, 2), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
455 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
456 |
MK(0, 0, 1, 1), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
457 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
458 |
MK(0, 0, 1, 2), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
459 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
460 |
MK(0, 0, 1, 1), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
461 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
462 |
MK(0, 0, 1, 2), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
463 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
464 |
MK(0, 0, 1, 1), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
465 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
466 |
MK(0, 0, 1, 2), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
467 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
468 |
MK(0, 0, 1, 1), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
469 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
470 |
MK(0, 0, 1, 2), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
471 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
472 |
MK(0, 0, 1, 1), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
473 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
474 |
MK(0, 0, 1, 2), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
475 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
476 |
MK(0, 0, 1, 1), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
477 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
478 |
MK(0, 0, 1, 2), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
479 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
480 |
MK(0, 0, 1, 1), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
481 |
MK(2, 1, 3, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
482 |
MK(1, 1, 3, 1), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
483 |
MK(2, 1, 3, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
484 |
MK(1, 1, 3, 2), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
485 |
MK(2, 1, 3, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
486 |
MK(1, 1, 3, 1), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
487 |
MK(2, 1, 3, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
488 |
MK(1, 0, 1, 2), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
489 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
490 |
MK(1, 0, 1, 1), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
491 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
492 |
MK(1, 0, 1, 2), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
493 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
494 |
MK(1, 0, 1, 1), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
495 |
MK(0, 0, 1, 0), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
496 |
MK(1, 0, 1, 2), |
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
497 |
ME(2), |
|
4344
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
498 |
MK(0, 0, 0, 0xA), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
499 |
MK(0, 0, 0, 0xB), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
500 |
MK(0, 0, 0, 0xC), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
501 |
MK(0, 0, 0, 0xD), |
|
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
502 |
MK(0, 0, 0, 0xE), |
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
503 |
ME(0) |
| 0 | 504 |
}; |
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
505 |
#undef ME |
| 0 | 506 |
#undef MK |
507 |
||
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
508 |
static const BubbleMovement * const _bubble_movement[] = {
|
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
509 |
_bubble_float_sw, |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
510 |
_bubble_float_ne, |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
511 |
_bubble_float_se, |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
512 |
_bubble_float_nw, |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
513 |
_bubble_burst, |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
514 |
_bubble_absorb, |
| 0 | 515 |
}; |
516 |
||
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
517 |
static void BubbleTick(Vehicle *v) |
| 0 | 518 |
{
|
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
519 |
/* |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
520 |
* Warning: those effects can NOT use Random(), and have to use |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
521 |
* InteractiveRandom(), because somehow someone forgot to save |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
522 |
* spritenum to the savegame, and so it will cause desyncs in |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
523 |
* multiplayer!! (that is: in ToyLand) |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
524 |
*/ |
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
525 |
uint et; |
| 0 | 526 |
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
527 |
v->progress++; |
|
8892
8401e1338665
(svn r12659) -Cleanup: some style cleanups in vehicle.cpp.
rubidium
parents:
8891
diff
changeset
|
528 |
if ((v->progress & 3) != 0) return; |
| 0 | 529 |
|
530 |
BeginVehicleMove(v); |
|
531 |
||
532 |
if (v->spritenum == 0) {
|
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
533 |
v->cur_image++; |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
534 |
if (v->cur_image < SPR_BUBBLE_GENERATE_3) {
|
| 0 | 535 |
VehiclePositionChanged(v); |
536 |
EndVehicleMove(v); |
|
537 |
return; |
|
538 |
} |
|
|
9008
de19c73e405f
(svn r12803) -Cleanup: rename SpecialVehicle to EffectVehicle to have a uniform naming of the thing instead of using both names for the same thing.
rubidium
parents:
9005
diff
changeset
|
539 |
if (v->u.effect.animation_substate != 0) {
|
| 2635 | 540 |
v->spritenum = GB(InteractiveRandom(), 0, 2) + 1; |
| 0 | 541 |
} else {
|
542 |
v->spritenum = 6; |
|
543 |
} |
|
544 |
et = 0; |
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
545 |
} else {
|
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
546 |
et = v->engine_type + 1; |
| 0 | 547 |
} |
548 |
||
|
8892
8401e1338665
(svn r12659) -Cleanup: some style cleanups in vehicle.cpp.
rubidium
parents:
8891
diff
changeset
|
549 |
const BubbleMovement *b = &_bubble_movement[v->spritenum - 1][et]; |
| 0 | 550 |
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
551 |
if (b->y == 4 && b->x == 0) {
|
| 0 | 552 |
EndVehicleMove(v); |
|
7398
b933416cf32b
(svn r10770) -Codechange: use the pool item class as super class for the vehicle struct.
rubidium
parents:
7387
diff
changeset
|
553 |
delete v; |
| 0 | 554 |
return; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
555 |
} |
|
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
556 |
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
557 |
if (b->y == 4 && b->x == 1) {
|
|
7967
a230c063a672
(svn r11523) -Codechange: Move the CHANCE macros to core/random_func.cpp cause they depend on Random()
skidd13
parents:
7950
diff
changeset
|
558 |
if (v->z_pos > 180 || Chance16I(1, 96, InteractiveRandom())) {
|
| 0 | 559 |
v->spritenum = 5; |
| 541 | 560 |
SndPlayVehicleFx(SND_2F_POP, v); |
| 0 | 561 |
} |
562 |
et = 0; |
|
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
563 |
} |
|
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
564 |
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
565 |
if (b->y == 4 && b->x == 2) {
|
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
566 |
TileIndex tile; |
| 0 | 567 |
|
568 |
et++; |
|
| 541 | 569 |
SndPlayVehicleFx(SND_31_EXTRACT, v); |
| 0 | 570 |
|
|
1980
6c5917cfcb78
(svn r2486) Turn TILE_FROM_XY into an inline function and rename it to TileVirtXY
tron
parents:
1977
diff
changeset
|
571 |
tile = TileVirtXY(v->x_pos, v->y_pos); |
| 7466 | 572 |
if (IsTileType(tile, MP_INDUSTRY) && GetIndustryGfx(tile) == GFX_BUBBLE_CATCHER) AddAnimatedTile(tile); |
| 0 | 573 |
} |
574 |
||
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
575 |
v->engine_type = et; |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
576 |
b = &_bubble_movement[v->spritenum - 1][et]; |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
577 |
|
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
578 |
v->x_pos += b->x; |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
579 |
v->y_pos += b->y; |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
580 |
v->z_pos += b->z; |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
581 |
v->cur_image = SPR_BUBBLE_0 + b->image; |
| 0 | 582 |
|
583 |
VehiclePositionChanged(v); |
|
584 |
EndVehicleMove(v); |
|
585 |
} |
|
586 |
||
587 |
||
588 |
typedef void EffectInitProc(Vehicle *v); |
|
589 |
typedef void EffectTickProc(Vehicle *v); |
|
590 |
||
591 |
static EffectInitProc * const _effect_init_procs[] = {
|
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
592 |
ChimneySmokeInit, |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
593 |
SteamSmokeInit, |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
594 |
DieselSmokeInit, |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
595 |
ElectricSparkInit, |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
596 |
SmokeInit, |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
597 |
ExplosionLargeInit, |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
598 |
BreakdownSmokeInit, |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
599 |
ExplosionSmallInit, |
|
1364
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
600 |
BulldozerInit, |
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
601 |
BubbleInit, |
| 0 | 602 |
}; |
603 |
||
604 |
static EffectTickProc * const _effect_tick_procs[] = {
|
|
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
605 |
ChimneySmokeTick, |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
606 |
SteamSmokeTick, |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
607 |
DieselSmokeTick, |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
608 |
ElectricSparkTick, |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
609 |
SmokeTick, |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
610 |
ExplosionLargeTick, |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
611 |
BreakdownSmokeTick, |
|
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
612 |
ExplosionSmallTick, |
|
1364
238934514bfd
(svn r1868) Improve readability of the bulldozer movement code
tron
parents:
1359
diff
changeset
|
613 |
BulldozerTick, |
|
1371
fc15eaac6bb2
(svn r1875) Effect vehicle overhaul: enumerate sprites, descriptive names for functions and miscellaneous improvements
tron
parents:
1365
diff
changeset
|
614 |
BubbleTick, |
| 0 | 615 |
}; |
616 |
||
617 |
||
|
9008
de19c73e405f
(svn r12803) -Cleanup: rename SpecialVehicle to EffectVehicle to have a uniform naming of the thing instead of using both names for the same thing.
rubidium
parents:
9005
diff
changeset
|
618 |
Vehicle *CreateEffectVehicle(int x, int y, int z, EffectVehicleType type) |
| 0 | 619 |
{
|
|
9008
de19c73e405f
(svn r12803) -Cleanup: rename SpecialVehicle to EffectVehicle to have a uniform naming of the thing instead of using both names for the same thing.
rubidium
parents:
9005
diff
changeset
|
620 |
Vehicle *v = new EffectVehicle(); |
| 0 | 621 |
if (v != NULL) {
|
622 |
v->subtype = type; |
|
623 |
v->x_pos = x; |
|
624 |
v->y_pos = y; |
|
625 |
v->z_pos = z; |
|
626 |
v->tile = 0; |
|
|
6558
c88e142f896e
(svn r9760) -Codechange: remove the need for saving some vehicle variables.
rubidium
parents:
6553
diff
changeset
|
627 |
v->UpdateDeltaXY(INVALID_DIR); |
| 0 | 628 |
v->vehstatus = VS_UNCLICKABLE; |
629 |
||
630 |
_effect_init_procs[type](v); |
|
631 |
||
632 |
VehiclePositionChanged(v); |
|
633 |
BeginVehicleMove(v); |
|
634 |
EndVehicleMove(v); |
|
635 |
} |
|
636 |
return v; |
|
637 |
} |
|
638 |
||
|
9008
de19c73e405f
(svn r12803) -Cleanup: rename SpecialVehicle to EffectVehicle to have a uniform naming of the thing instead of using both names for the same thing.
rubidium
parents:
9005
diff
changeset
|
639 |
Vehicle *CreateEffectVehicleAbove(int x, int y, int z, EffectVehicleType type) |
| 0 | 640 |
{
|
|
7922
a7e266f966d9
(svn r11475) -Codechange: rename clamp and clampu to Clamp and ClampU to fit with the coding style
skidd13
parents:
7867
diff
changeset
|
641 |
int safe_x = Clamp(x, 0, MapMaxX() * TILE_SIZE); |
|
a7e266f966d9
(svn r11475) -Codechange: rename clamp and clampu to Clamp and ClampU to fit with the coding style
skidd13
parents:
7867
diff
changeset
|
642 |
int safe_y = Clamp(y, 0, MapMaxY() * TILE_SIZE); |
|
5295
9cdf003cf6d1
(svn r7448) -Fix (r5794): use the height of the edge of the map for effect vehicles that are outside the map.
rubidium
parents:
5256
diff
changeset
|
643 |
return CreateEffectVehicle(x, y, GetSlopeZ(safe_x, safe_y) + z, type); |
| 0 | 644 |
} |
645 |
||
|
9008
de19c73e405f
(svn r12803) -Cleanup: rename SpecialVehicle to EffectVehicle to have a uniform naming of the thing instead of using both names for the same thing.
rubidium
parents:
9005
diff
changeset
|
646 |
Vehicle *CreateEffectVehicleRel(const Vehicle *v, int x, int y, int z, EffectVehicleType type) |
| 0 | 647 |
{
|
648 |
return CreateEffectVehicle(v->x_pos + x, v->y_pos + y, v->z_pos + z, type); |
|
649 |
} |
|
650 |
||
|
9008
de19c73e405f
(svn r12803) -Cleanup: rename SpecialVehicle to EffectVehicle to have a uniform naming of the thing instead of using both names for the same thing.
rubidium
parents:
9005
diff
changeset
|
651 |
void EffectVehicle::Tick() |
| 0 | 652 |
{
|
|
7135
3c1bcca0d6bb
(svn r10409) -Codechange: replace (Aircraft|RoadVeh|Ship|Train)_Tick with a Tick method in the Vehicle class.
rubidium
parents:
7134
diff
changeset
|
653 |
_effect_tick_procs[this->subtype](this); |
| 0 | 654 |
} |
655 |
||
|
9008
de19c73e405f
(svn r12803) -Cleanup: rename SpecialVehicle to EffectVehicle to have a uniform naming of the thing instead of using both names for the same thing.
rubidium
parents:
9005
diff
changeset
|
656 |
void EffectVehicle::UpdateDeltaXY(Direction direction) |
|
6558
c88e142f896e
(svn r9760) -Codechange: remove the need for saving some vehicle variables.
rubidium
parents:
6553
diff
changeset
|
657 |
{
|
|
c88e142f896e
(svn r9760) -Codechange: remove the need for saving some vehicle variables.
rubidium
parents:
6553
diff
changeset
|
658 |
this->x_offs = 0; |
|
c88e142f896e
(svn r9760) -Codechange: remove the need for saving some vehicle variables.
rubidium
parents:
6553
diff
changeset
|
659 |
this->y_offs = 0; |
|
8793
5e35232593c3
(svn r12531) -Codechange: Rename some variables for consistency.
frosch
parents:
8786
diff
changeset
|
660 |
this->x_extent = 1; |
|
5e35232593c3
(svn r12531) -Codechange: Rename some variables for consistency.
frosch
parents:
8786
diff
changeset
|
661 |
this->y_extent = 1; |
|
5e35232593c3
(svn r12531) -Codechange: Rename some variables for consistency.
frosch
parents:
8786
diff
changeset
|
662 |
this->z_extent = 1; |
|
6558
c88e142f896e
(svn r9760) -Codechange: remove the need for saving some vehicle variables.
rubidium
parents:
6553
diff
changeset
|
663 |
} |