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

(svn r2011) - Fix: [ 1162209 ] Fix OS/2 build (orudge) #2

Browse Source
This commit is contained in:
darkvater
2005-03-15 12:21:59 +00:00
parent 2c762a67ab
commit cc99c3e262
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
network_core.h
View File

@@ -111,6 +111,7 @@ typedef struct ifreq IFREQ;
# include <nerrno.h> # include <nerrno.h>
# define INADDR_NONE 0xffffffff # define INADDR_NONE 0xffffffff
typedef int socklen_t;
typedef unsigned long in_addr_t; typedef unsigned long in_addr_t;
#endif // OS/2 #endif // OS/2

5
station_cmd.c
View File

@@ -634,10 +634,13 @@ static void UpdateStationAcceptance(Station *st, bool show_msg)
uint old_acc, new_acc; uint old_acc, new_acc;
const RoadStop *cur_rs; const RoadStop *cur_rs;
int i; int i;
Rectangle rect = { MapSizeX(), MapSizeY(), 0, 0 }; Rectangle rect;
int rad; int rad;
AcceptedCargo accepts; AcceptedCargo accepts;
rect.min_x = MapSizeX();
rect.min_y = MapSizeY();
rect.max_x = rect.max_y = 0;
// Don't update acceptance for a buoy // Don't update acceptance for a buoy
if (st->had_vehicle_of_type & HVOT_BUOY) if (st->had_vehicle_of_type & HVOT_BUOY)
return; return;

7
train_cmd.c
View File

@@ -2589,10 +2589,9 @@ red_light: {
v->progress = 255-10; v->progress = 255-10;
if (++v->load_unload_time_rem < _patches.wait_twoway_signal * 73) { if (++v->load_unload_time_rem < _patches.wait_twoway_signal * 73) {
TileIndex o_tile = gp.new_tile + TileOffsByDir(enterdir); TileIndex o_tile = gp.new_tile + TileOffsByDir(enterdir);
VehicleAtSignalData vasd = { VehicleAtSignalData vasd;
o_tile, vasd.tile = o_tile;
dir ^ 4 vasd.direction = dir ^ 4;
};
/* check if a train is waiting on the other side */ /* check if a train is waiting on the other side */
if (VehicleFromPos(o_tile, &vasd, CheckVehicleAtSignal) == NULL) if (VehicleFromPos(o_tile, &vasd, CheckVehicleAtSignal) == NULL)