--- a/src/ai/trolly/shared.cpp Mon Dec 03 23:39:38 2007 +0000
+++ b/src/ai/trolly/shared.cpp Tue Jan 22 21:00:30 2008 +0000
@@ -3,9 +3,10 @@
#include "../../stdafx.h"
#include "../../openttd.h"
#include "../../debug.h"
-#include "../../map.h"
+#include "../../map_func.h"
+#include "../../vehicle_base.h"
+#include "../../player_base.h"
#include "trolly.h"
-#include "../../vehicle.h"
int AiNew_GetRailDirection(TileIndex tile_a, TileIndex tile_b, TileIndex tile_c)
{
@@ -80,8 +81,8 @@
uint i;
for (i = 0; i < AI_MAX_SPECIAL_VEHICLES; i++) {
- if (p->ainew.special_vehicles[i].veh_id == v->index) {
- return p->ainew.special_vehicles[i].flag;
+ if (_players_ainew[p->index].special_vehicles[i].veh_id == v->index) {
+ return _players_ainew[p->index].special_vehicles[i].flag;
}
}
@@ -96,13 +97,13 @@
uint i;
for (i = 0; i < AI_MAX_SPECIAL_VEHICLES; i++) {
- if (p->ainew.special_vehicles[i].veh_id == v->index) {
- p->ainew.special_vehicles[i].flag |= flag;
+ if (_players_ainew[p->index].special_vehicles[i].veh_id == v->index) {
+ _players_ainew[p->index].special_vehicles[i].flag |= flag;
return true;
}
if (new_id == -1 &&
- p->ainew.special_vehicles[i].veh_id == 0 &&
- p->ainew.special_vehicles[i].flag == 0) {
+ _players_ainew[p->index].special_vehicles[i].veh_id == 0 &&
+ _players_ainew[p->index].special_vehicles[i].flag == 0) {
new_id = i;
}
}
@@ -112,7 +113,7 @@
DEBUG(ai, 1, "special_vehicles list is too small");
return false;
}
- p->ainew.special_vehicles[new_id].veh_id = v->index;
- p->ainew.special_vehicles[new_id].flag = flag;
+ _players_ainew[p->index].special_vehicles[new_id].veh_id = v->index;
+ _players_ainew[p->index].special_vehicles[new_id].flag = flag;
return true;
}