summaryrefslogtreecommitdiff
path: root/train_cmd.c
diff options
context:
space:
mode:
authortron <tron@openttd.org>2005-11-14 08:09:57 +0000
committertron <tron@openttd.org>2005-11-14 08:09:57 +0000
commit524fd25cbd2b32fd8166e196c5eab1f2f7e82a8a (patch)
tree80b15078ff5a1c09815ccb23f4c9e7629774dae4 /train_cmd.c
parentb34de09e627fc5f8d7579c96c8b4290593c1dd32 (diff)
downloadopenttd-524fd25cbd2b32fd8166e196c5eab1f2f7e82a8a.tar.xz
(svn r3177) GB, CLRBIT, HASBIT, TOGGLEBIT
Diffstat (limited to 'train_cmd.c')
-rw-r--r--train_cmd.c4
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);