mirror of https://github.com/OpenTTD/OpenTTD
(svn r1752) - Fix: MSVC acting up once again, as well as project file updates for the missing files.
parent
a2dec6c32a
commit
9776f2350b
4
npf.c
4
npf.c
|
@ -764,10 +764,10 @@ void NPFFillWithOrderData(NPFFindStationOrTileData* fstd, Vehicle* v) {
|
||||||
* So only for train orders to stations we fill fstd->station_index, for all
|
* So only for train orders to stations we fill fstd->station_index, for all
|
||||||
* others only dest_coords */
|
* others only dest_coords */
|
||||||
if ((v->current_order.type) == OT_GOTO_STATION && v->type == VEH_Train) {
|
if ((v->current_order.type) == OT_GOTO_STATION && v->type == VEH_Train) {
|
||||||
|
const Station* st = GetStation(v->current_order.station);
|
||||||
|
TileIndexDiffC center = {st->trainst_w/2, st->trainst_h/2};
|
||||||
fstd->station_index = v->current_order.station;
|
fstd->station_index = v->current_order.station;
|
||||||
/* Let's take the center of the station as our target tile for trains */
|
/* Let's take the center of the station as our target tile for trains */
|
||||||
Station* st = GetStation(v->current_order.station);
|
|
||||||
TileIndexDiffC center = {st->trainst_w/2, st->trainst_h/2};
|
|
||||||
fstd->dest_coords = TILE_ADD(st->train_tile, ToTileIndexDiff(center));
|
fstd->dest_coords = TILE_ADD(st->train_tile, ToTileIndexDiff(center));
|
||||||
} else {
|
} else {
|
||||||
fstd->dest_coords = v->dest_tile;
|
fstd->dest_coords = v->dest_tile;
|
||||||
|
|
8
ttd.dsp
8
ttd.dsp
|
@ -264,6 +264,10 @@ SOURCE=.\network.c
|
||||||
SOURCE=.\newgrf.c
|
SOURCE=.\newgrf.c
|
||||||
# End Source File
|
# End Source File
|
||||||
|
|
||||||
|
# Begin Source File
|
||||||
|
SOURCE=.\npf.c
|
||||||
|
# End Source File
|
||||||
|
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
SOURCE=.\oldloader.c
|
SOURCE=.\oldloader.c
|
||||||
# End Source File
|
# End Source File
|
||||||
|
@ -501,6 +505,10 @@ SOURCE=.\network.h
|
||||||
SOURCE=.\news.h
|
SOURCE=.\news.h
|
||||||
# End Source File
|
# End Source File
|
||||||
|
|
||||||
|
# Begin Source File
|
||||||
|
SOURCE=.\npf.h
|
||||||
|
# End Source File
|
||||||
|
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
SOURCE=.\pathfind.h
|
SOURCE=.\pathfind.h
|
||||||
# End Source File
|
# End Source File
|
||||||
|
|
|
@ -600,6 +600,9 @@
|
||||||
<File
|
<File
|
||||||
RelativePath=".\newgrf.c">
|
RelativePath=".\newgrf.c">
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath=".\npf.c">
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="oldloader.c">
|
RelativePath="oldloader.c">
|
||||||
<FileConfiguration
|
<FileConfiguration
|
||||||
|
@ -1211,6 +1214,9 @@
|
||||||
<File
|
<File
|
||||||
RelativePath="news.h">
|
RelativePath="news.h">
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath=".\npf.h">
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="pathfind.h">
|
RelativePath="pathfind.h">
|
||||||
</File>
|
</File>
|
||||||
|
|
Loading…
Reference in New Issue