gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-01-24 16:09:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r3643) Remove a local variable which is just a pointer to a road stop status field and had the sensible name 'b'; instead directly use the road stop status field

Browse Source
This commit is contained in:
tron 2006-02-21 06:43:53 +00:00
parent e9e4b7735f
commit 35fb17947a
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
roadveh_cmd.c
View File

@ -1294,11 +1294,10 @@ again:
} }
if (IS_BYTE_INSIDE(_m[v->tile].m5, 0x43, 0x4B)) { if (IS_BYTE_INSIDE(_m[v->tile].m5, 0x43, 0x4B)) {
RoadStop *rs = GetRoadStopByTile(v->tile, GetRoadStopType(v->tile)); RoadStop *rs = GetRoadStopByTile(v->tile, GetRoadStopType(v->tile));
byte *b = &rs->status;
//we have reached a loading bay, mark it as used // reached a loading bay, mark it as used and clear the usage bit
//and clear the usage bit (0x80) of the stop SETBIT(rs->status, v->u.road.state & 2 ? 1 : 0); // occupied bay
*b = (*b | ((v->u.road.state&2)?2:1)) & ~0x80; CLRBIT(rs->status, 7); // usage bit
} }
} }
@ -1385,7 +1384,6 @@ again:
if (v->u.road.state >= 0x20 && if (v->u.road.state >= 0x20 &&
_road_veh_data_1[v->u.road.state - 0x20 + (_opt.road_side<<4)] == v->u.road.frame) { _road_veh_data_1[v->u.road.state - 0x20 + (_opt.road_side<<4)] == v->u.road.frame) {
RoadStop *rs = GetRoadStopByTile(v->tile, GetRoadStopType(v->tile)); RoadStop *rs = GetRoadStopByTile(v->tile, GetRoadStopType(v->tile));
byte *b = &rs->status;
st = GetStation(_m[v->tile].m2); st = GetStation(_m[v->tile].m2);
@ -1393,7 +1391,7 @@ again:
v->current_order.type != OT_GOTO_DEPOT) { v->current_order.type != OT_GOTO_DEPOT) {
Order old_order; Order old_order;
*b &= ~0x80; CLRBIT(rs->status, 7);
v->last_station_visited = _m[v->tile].m2; v->last_station_visited = _m[v->tile].m2;
@ -1419,14 +1417,14 @@ again:
} }
if (v->current_order.type != OT_GOTO_DEPOT) { if (v->current_order.type != OT_GOTO_DEPOT) {
if (*b&0x80) { if (HASBIT(rs->status, 7)) {
v->cur_speed = 0; v->cur_speed = 0;
return; return;
} }
v->current_order.type = OT_NOTHING; v->current_order.type = OT_NOTHING;
v->current_order.flags = 0; v->current_order.flags = 0;
} }
*b |= 0x80; SETBIT(rs->status, 7);
if (rs == v->u.road.slot) { if (rs == v->u.road.slot) {
//we have arrived at the correct station //we have arrived at the correct station