petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r2432) Use GetEngine() instead of DEREF_ENGINE() or even _engines[]

Browse Source
This commit is contained in:
tron
2005-06-07 18:13:49 +00:00
parent d0cdb45b6c
commit fa8f46c0b7
16 changed files with 59 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
train_cmd.c
View File

@@ -481,7 +481,7 @@ static int32 CmdBuildRailWagon(uint engine, uint tile, uint32 flags)
v->value = value;
// v->day_counter = 0;
e = &_engines[engine];
e = GetEngine(engine);
v->u.rail.railtype = e->railtype;
v->build_year = _cur_year;
@@ -650,7 +650,7 @@ int32 CmdBuildRailVehicle(int x, int y, uint32 flags, uint32 p1, uint32 p2)
v->dest_tile = 0;
v->engine_type = (byte)p1;
e = DEREF_ENGINE(p1);
e = GetEngine(p1);
v->reliability = e->reliability;
v->reliability_spd_dec = e->reliability_spd_dec;
@@ -1693,9 +1693,9 @@ static void HandleLocomotiveSmokeCloud(Vehicle *v)
int engtype = v->engine_type;
// no smoke?
if (RailVehInfo(engtype)->flags & 2
|| _engines[engtype].railtype > 0
|| (v->vehstatus&VS_HIDDEN) || (v->u.rail.track & 0xC0) )
if (RailVehInfo(engtype)->flags & 2 ||
GetEngine(engtype)->railtype > 0 ||
(v->vehstatus & VS_HIDDEN) || (v->u.rail.track & 0xC0))
continue;
switch (RailVehInfo(engtype)->engclass) {
@@ -1738,7 +1738,7 @@ static void TrainPlayLeaveStationSound(Vehicle *v)
int engtype = v->engine_type;
switch (_engines[engtype].railtype) {
switch (GetEngine(engtype)->railtype) {
case 0:
SndPlayVehicleFx(sfx[RailVehInfo(engtype)->engclass], v);
break;