dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r4079) Add GetSation{Index,ByTile}() to get the station index resp. the station from a tile

Browse Source
This commit is contained in:
tron
2006-03-24 08:55:08 +00:00
parent 8ce4bdfad9
commit f6285a659c
11 changed files with 74 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
roadveh_cmd.c
View File

@@ -5,6 +5,7 @@
#include "debug.h"
#include "functions.h"
#include "road_map.h"
#include "station_map.h"
#include "table/strings.h"
#include "map.h"
#include "tile.h"
@@ -1415,7 +1416,7 @@ again:
if (v->u.road.state >= 0x20 &&
_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));
Station* st = GetStation(_m[v->tile].m2);
Station* st = GetStationByTile(v->tile);
if (v->current_order.type != OT_LEAVESTATION &&
v->current_order.type != OT_GOTO_DEPOT) {
@@ -1423,7 +1424,7 @@ again:
CLRBIT(rs->status, 7);
v->last_station_visited = _m[v->tile].m2;
v->last_station_visited = GetStationIndex(v->tile);
RoadVehArrivesAt(v, st);