diff options
author | tron <tron@openttd.org> | 2005-11-14 08:09:57 +0000 |
---|---|---|
committer | tron <tron@openttd.org> | 2005-11-14 08:09:57 +0000 |
commit | 833032adc09ce95c68d4a4b412221a0b3f88e670 (patch) | |
tree | 80b15078ff5a1c09815ccb23f4c9e7629774dae4 /train_cmd.c | |
parent | 357aba747578ecd3b8cc1a29bc740634211ada37 (diff) | |
download | openttd-833032adc09ce95c68d4a4b412221a0b3f88e670.tar.xz |
(svn r3177) GB, CLRBIT, HASBIT, TOGGLEBIT
Diffstat (limited to 'train_cmd.c')
-rw-r--r-- | train_cmd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/train_cmd.c b/train_cmd.c index aed2c8ea8..3f2667ac2 100644 --- a/train_cmd.c +++ b/train_cmd.c @@ -1623,10 +1623,10 @@ int32 CmdForceTrainProceed(int x, int y, uint32 flags, uint32 p1, uint32 p2) */ int32 CmdRefitRailVehicle(int x, int y, uint32 flags, uint32 p1, uint32 p2) { + CargoID new_cid = GB(p2, 0, 8); Vehicle *v; int32 cost; uint num; - CargoID new_cid = p2 & 0xFF; //gets the cargo number if (!IsVehicleIndex(p1)) return CMD_ERROR; @@ -3173,7 +3173,7 @@ static void ChangeTrainDirRandomly(Vehicle *v) do { //I need to buffer the train direction if (!(v->u.rail.track & 0x40)) - v->direction = (v->direction + _random_dir_change[Random()&3]) & 7; + v->direction = (v->direction + _random_dir_change[GB(Random(), 0, 2)]) & 7; if (!(v->vehstatus & VS_HIDDEN)) { BeginVehicleMove(v); UpdateTrainDeltaXY(v, v->direction); |