mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r4204) - Get trunk compiling again on OS/2

This commit is contained in:
orudge 2006-03-31 16:01:59 +00:00
parent fa467d2f58
commit 0fe27c16af
6 changed files with 529 additions and 449 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ai/trolly/pathfinder.c
View File

@ -368,7 +368,7 @@ static void AyStar_AiPathFinder_GetNeighbours(AyStar *aystar, OpenListNode *curr
}
extern uint GetRailFoundation(uint tileh, uint bits);
extern uint GetRailFoundation(uint tileh, TrackBits bits);
extern uint GetRoadFoundation(uint tileh, uint bits);
extern uint GetBridgeFoundation(uint tileh, Axis); // XXX function declaration in .c
enum {

15
elrail.c
View File

@ -123,17 +123,26 @@ static void DrawCatenaryRailway(const TileInfo *ti)
TrackBits trackconfig[TS_END];
bool isflat[TS_END];
/* Note that ti->tileh has already been adjusted for Foundations */
uint tileh[TS_END] = {ti->tileh, 0};
uint tileh[TS_END];
TLG tlg = GetTLG(ti->tile);
byte PCPstatus = 0;
byte OverridePCP = 0;
byte PPPpreferred[DIAGDIR_END] = {0xFF, 0xFF, 0xFF, 0xFF};
byte PPPallowed[DIAGDIR_END] = {AllowedPPPonPCP[0], AllowedPPPonPCP[1], AllowedPPPonPCP[2], AllowedPPPonPCP[3]};
byte PPPpreferred[DIAGDIR_END];
byte PPPallowed[DIAGDIR_END];
byte PPPbuffer[DIAGDIR_END];
DiagDirection i;
Track t;
tileh[0] = ti->tileh;
tileh[1] = 0;
PPPpreferred[0] = PPPpreferred[1] = PPPpreferred[2] = PPPpreferred[3] = 0xFF;
PPPallowed[0] = AllowedPPPonPCP[0];
PPPallowed[1] = AllowedPPPonPCP[1];
PPPallowed[2] = AllowedPPPonPCP[2];
PPPallowed[3] = AllowedPPPonPCP[3];
/* Find which rail bits are present, and select the override points.
We don't draw a pylon:
1) INSIDE a tunnel (we wouldn't see it anyway)

947
openttd.tgt
View File

File diff suppressed because it is too large Load Diff

4
os/os2/openttd.wpj
View File

@ -4,8 +4,8 @@ projectIdent
VpeMain
1
WRect
-32
-40
0
0
10304
10020
2

2
rail.h
View File

@ -512,5 +512,5 @@ void DrawDefaultWaypointSprite(int x, int y, RailType railtype);
*/
void DrawCatenary(const TileInfo *ti);
uint GetRailFoundation(uint tileh, uint bits);
uint GetRailFoundation(uint tileh, TrackBits bits);
#endif /* RAIL_H */

8
strgen/strgen.c
View File

@ -20,6 +20,14 @@
#define stderr stdout
#endif // __MORPHOS__
#ifdef __WATCOMC__
uint _map_log_x; // an unpleasant hack required because Watcom is insisting on
uint _map_size_x; // these variables being valid references in map.h
uint _map_size_y;
uint _map_tile_mask;
uint _map_size;
#endif
/* Compiles a list of strings into a compiled string list */
typedef void (*ParseCmdProc)(char *buf, int value);