diff options
| author | tron <tron@openttd.org> | 2004-12-02 22:53:07 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2004-12-02 22:53:07 +0000 |
| commit | 265ac671831f4ba9f79a69e94e0dd527d9a7a132 (patch) | |
| tree | 822a14c0bf1d92e45c85d4ce62bc58b7b6cef6c7 /aircraft_cmd.c | |
| parent | 0f5793ffa06572f1c2e2efc47d36e8ff92141469 (diff) | |
| download | openttd-265ac671831f4ba9f79a69e94e0dd527d9a7a132.tar.xz | |
(svn r901) Small step in the process to clean up the DPARAM mess:
- reduce to 2 sizes (*DParam64 for 64bit values, *DParam for the rest)
- use inline functions instead of macros
- add assert()s to check for buffer overruns
Diffstat (limited to 'aircraft_cmd.c')
| -rw-r--r-- | aircraft_cmd.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/aircraft_cmd.c b/aircraft_cmd.c index 41e612559..58554398e 100644 --- a/aircraft_cmd.c +++ b/aircraft_cmd.c @@ -66,11 +66,11 @@ void DrawAircraftEngine(int x, int y, int engine, uint32 image_ormod) void DrawAircraftEngineInfo(int engine, int x, int y, int maxw) { - SET_DPARAM32(0, ((_price.aircraft_base >> 3) * aircraft_vehinfo(engine).base_cost) >> 5); - SET_DPARAM16(1, aircraft_vehinfo(engine).max_speed << 3); - SET_DPARAM16(2, aircraft_vehinfo(engine).passanger_capacity); - SET_DPARAM16(3, aircraft_vehinfo(engine).mail_capacity); - SET_DPARAM32(4, aircraft_vehinfo(engine).running_cost * _price.aircraft_running >> 8); + SetDParam(0, ((_price.aircraft_base >> 3) * aircraft_vehinfo(engine).base_cost) >> 5); + SetDParam(1, aircraft_vehinfo(engine).max_speed << 3); + SetDParam(2, aircraft_vehinfo(engine).passanger_capacity); + SetDParam(3, aircraft_vehinfo(engine).mail_capacity); + SetDParam(4, aircraft_vehinfo(engine).running_cost * _price.aircraft_running >> 8); DrawStringMultiCenter(x, y, STR_A02E_COST_MAX_SPEED_CAPACITY, maxw); } @@ -1084,12 +1084,12 @@ static void MaybeCrashAirplane(Vehicle *v) amt = 2; if (v->cargo_type == CT_PASSENGERS) amt += v->cargo_count; - SET_DPARAM16(0, amt); + SetDParam(0, amt); v->cargo_count = 0; v->next->cargo_count = 0, - SET_DPARAM16(1, st->index); + SetDParam(1, st->index); AddNewsItem(STR_A034_PLANE_CRASH_DIE_IN_FIREBALL, NEWS_FLAGS(NM_THIN, NF_VIEWPORT|NF_VEHICLE, NT_ACCIDENT, 0), v->index, @@ -1116,7 +1116,7 @@ static void AircraftEntersTerminal(Vehicle *v) uint32 flags; st->had_vehicle_of_type |= HVOT_AIRCRAFT; - SET_DPARAM16(0, st->index); + SetDParam(0, st->index); // show newsitem of celebrating citizens flags = (v->owner == _local_player) ? NEWS_FLAGS(NM_THIN, NF_VIEWPORT|NF_VEHICLE, NT_ARRIVAL_PLAYER, 0) : NEWS_FLAGS(NM_THIN, NF_VIEWPORT|NF_VEHICLE, NT_ARRIVAL_OTHER, 0); AddNewsItem( @@ -1161,7 +1161,7 @@ static void AircraftEnterHangar(Vehicle *v) v->vehstatus |= VS_STOPPED; if (v->owner == _local_player) { - SET_DPARAM16(0, v->unitnumber); + SetDParam(0, v->unitnumber); AddNewsItem( STR_A014_AIRCRAFT_IS_WAITING_IN, NEWS_FLAGS(NM_SMALL, NF_VIEWPORT|NF_VEHICLE, NT_ADVICE, 0), |