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

(svn r3660) Convert further road bits and type references to the functions/enums

Browse Source
This commit is contained in:
tron
2006-02-23 12:24:19 +00:00
parent c3c0afb902
commit 6a74cb2787
6 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ai/trolly/trolly.c
View File

@@ -21,6 +21,7 @@
#include "../../openttd.h"
#include "../../debug.h"
#include "../../functions.h"
#include "../../road.h"
#include "../../table/strings.h"
#include "../../map.h"
#include "../../tile.h"
@@ -793,8 +794,7 @@ static void AiNew_State_FindDepot(Player *p)
tile = p->ainew.path_info.route[i];
for (j = 0; j < 4; j++) {
if (IsTileType(tile + TileOffsByDir(j), MP_STREET)) {
// Its a street, test if it is a depot
if (_m[tile + TileOffsByDir(j)].m5 & 0x20) {
if (GetRoadType(tile + TileOffsByDir(j)) == ROAD_DEPOT) {
// We found a depot, is it ours? (TELL ME!!!)
if (IsTileOwner(tile + TileOffsByDir(j), _current_player)) {
// Now, is it pointing to the right direction.........
@@ -1100,7 +1100,7 @@ static void AiNew_State_BuildDepot(Player *p)
int res = 0;
assert(p->ainew.state == AI_STATE_BUILD_DEPOT);
if (IsTileType(p->ainew.depot_tile, MP_STREET) && _m[p->ainew.depot_tile].m5 & 0x20) {
if (IsTileType(p->ainew.depot_tile, MP_STREET) && GetRoadType(p->ainew.depot_tile) == ROAD_DEPOT) {
if (IsTileOwner(p->ainew.depot_tile, _current_player)) {
// The depot is already builded!
p->ainew.state = AI_STATE_BUILD_VEHICLE;