Mercurial Mercurial > openttd-ottdgrfs / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
(svn r77) -Fix: [1010788] AI service interval bug (tnx truesatan)
authortruelight
Tue, 17 Aug 2004 16:20:04 +0000
changeset 76 30511cbc5188
parent 75 9bf1fec1a66a
child 77 855f2aaf816b
(svn r77) -Fix: [1010788] AI service interval bug (tnx truesatan)
-Add: AI overrides service interval to 180 days
-Fix: AI hanged when all vehicles were disabled in Patch menu
ai.c file | annotate | diff | comparison | revisions
aircraft_cmd.c file | annotate | diff | comparison | revisions
roadveh_cmd.c file | annotate | diff | comparison | revisions
ship_cmd.c file | annotate | diff | comparison | revisions
train_cmd.c file | annotate | diff | comparison | revisions 
--- a/ai.c	Tue Aug 17 15:37:12 2004 +0000
+++ b/ai.c	Tue Aug 17 16:20:04 2004 +0000
@@ -301,6 +301,8 @@
 			veh = _new_train_id;
 			AiRestoreVehicleOrders(&_vehicles[veh], orderbak);
 			DoCommandByTile(0, veh, 0, DC_EXEC, CMD_START_STOP_TRAIN);
+			// Force the service interval to 180 days.. else things can go very wrong :p
+			DoCommandByTile(0, veh, 180, DC_EXEC, CMD_CHANGE_TRAIN_SERVICE_INT);
 		}
 	}
 }
@@ -327,6 +329,8 @@
 			veh = _new_roadveh_id;
 			AiRestoreVehicleOrders(&_vehicles[veh], orderbak);
 			DoCommandByTile(0, veh, 0, DC_EXEC, CMD_START_STOP_ROADVEH);
+			// Force the service interval to 180 days.. else things can go very wrong :p
+			DoCommandByTile(0, veh, 180, DC_EXEC, CMD_CHANGE_ROADVEH_SERVICE_INT);
 		}
 	}
 }
@@ -353,6 +357,8 @@
 			veh = _new_aircraft_id;
 			AiRestoreVehicleOrders(&_vehicles[veh], orderbak);
 			DoCommandByTile(0, veh, 0, DC_EXEC, CMD_START_STOP_AIRCRAFT);
+			// Force the service interval to 180 days.. else things can go very wrong :p
+			DoCommandByTile(0, veh, 180, DC_EXEC, CMD_CHANGE_AIRCRAFT_SERVICE_INT);
 		}
 	}
 }
@@ -1492,6 +1498,10 @@
 	for(;;) {
 		r = (uint16)Random();
 		
+		if (_patches.ai_disable_veh_train && _patches.ai_disable_veh_roadveh &&
+			_patches.ai_disable_veh_aircraft && _patches.ai_disable_veh_ship)
+			return;
+		
 		if (r < 0x7626) {
 			if (_patches.ai_disable_veh_train) continue;
 			AiWantTrainRoute(p);
@@ -2422,6 +2432,8 @@
 	}
 
 	DoCommandByTile(0, loco_id, 0, DC_EXEC, CMD_START_STOP_TRAIN);
+	// Force the service interval to 180 days.. else things can go very wrong :p
+	DoCommandByTile(0, loco_id, 180, DC_EXEC, CMD_CHANGE_TRAIN_SERVICE_INT);
 
 	if (p->ai.num_want_fullload != 0)
 		p->ai.num_want_fullload--;
@@ -3167,6 +3179,8 @@
 	}
 
 	DoCommandByTile(0, loco_id, 0, DC_EXEC, CMD_START_STOP_ROADVEH);
+	// Force the service interval to 180 days.. else things can go very wrong :p
+	DoCommandByTile(0, loco_id, 180, DC_EXEC, CMD_CHANGE_ROADVEH_SERVICE_INT);
 
 	if (p->ai.num_want_fullload != 0)
 		p->ai.num_want_fullload--;
@@ -3473,6 +3487,8 @@
 	}
 
 	DoCommandByTile(0, loco_id, 0, DC_EXEC, CMD_START_STOP_AIRCRAFT);
+	// Force the service interval to 180 days.. else things can go very wrong :p
+	DoCommandByTile(0, loco_id, 180, DC_EXEC, CMD_CHANGE_AIRCRAFT_SERVICE_INT);
 
 	if (p->ai.num_want_fullload != 0)
 		p->ai.num_want_fullload--;
--- a/aircraft_cmd.c	Tue Aug 17 15:37:12 2004 +0000
+++ b/aircraft_cmd.c	Tue Aug 17 16:20:04 2004 +0000
@@ -525,7 +525,7 @@
 {
 	Station *st;
 
-	if (_patches.servint_aircraft == 0 && IS_HUMAN_PLAYER(v->owner))
+	if (_patches.servint_aircraft == 0)
 		return;
 
 	if (v->date_of_last_service + v->service_interval > _date)
@@ -537,7 +537,7 @@
 	if ((v->next_order & (OT_MASK | OF_FULL_LOAD)) == (OT_GOTO_DEPOT | OF_FULL_LOAD))
 		return;
 
- 	if (_patches.gotodepot && IS_HUMAN_PLAYER(v->owner) && ScheduleHasDepotOrders(v->schedule_ptr))
+ 	if (_patches.gotodepot && ScheduleHasDepotOrders(v->schedule_ptr))
  		return;
  
 	st = DEREF_STATION(v->next_order_param);
--- a/roadveh_cmd.c	Tue Aug 17 15:37:12 2004 +0000
+++ b/roadveh_cmd.c	Tue Aug 17 16:20:04 2004 +0000
@@ -1497,7 +1497,7 @@
 {
 	int i;
 
-	if (_patches.servint_roadveh == 0 && IS_HUMAN_PLAYER(v->owner))
+	if (_patches.servint_roadveh == 0)
 		return;
 
 	if (v->date_of_last_service + v->service_interval > _date)
@@ -1506,7 +1506,7 @@
 	if (v->vehstatus & VS_STOPPED)
 		return;
 
-	if (_patches.gotodepot && IS_HUMAN_PLAYER(v->owner) && ScheduleHasDepotOrders(v->schedule_ptr))
+	if (_patches.gotodepot && ScheduleHasDepotOrders(v->schedule_ptr))
 		return;
 	
 	// Don't interfere with a depot visit scheduled by the user, or a
--- a/ship_cmd.c	Tue Aug 17 15:37:12 2004 +0000
+++ b/ship_cmd.c	Tue Aug 17 16:20:04 2004 +0000
@@ -85,7 +85,7 @@
 {
 	int i;
 
-	if (_patches.servint_ships == 0 && IS_HUMAN_PLAYER(v->owner))
+	if (_patches.servint_ships == 0)
 		return;
 
 	if (v->date_of_last_service + v->service_interval > _date)
@@ -97,7 +97,7 @@
 	if ((v->next_order & (OT_MASK | OF_FULL_LOAD)) == (OT_GOTO_DEPOT | OF_FULL_LOAD))
 		return;
 
-	if (_patches.gotodepot && IS_HUMAN_PLAYER(v->owner) && ScheduleHasDepotOrders(v->schedule_ptr))
+	if (_patches.gotodepot && ScheduleHasDepotOrders(v->schedule_ptr))
 		return;
 
 	i = FindClosestShipDepot(v);
--- a/train_cmd.c	Tue Aug 17 15:37:12 2004 +0000
+++ b/train_cmd.c	Tue Aug 17 16:20:04 2004 +0000
@@ -2520,7 +2520,7 @@
 	uint tile;
 	byte depot;
 
-	if (_patches.servint_trains == 0 && IS_HUMAN_PLAYER(v->owner))
+	if (_patches.servint_trains == 0)
 		return;
 
 	if (v->date_of_last_service + v->service_interval > _date)
@@ -2529,7 +2529,7 @@
 	if (v->vehstatus & VS_STOPPED)
 		return;
 
-	if (_patches.gotodepot && IS_HUMAN_PLAYER(v->owner) && ScheduleHasDepotOrders(v->schedule_ptr))
+	if (_patches.gotodepot && ScheduleHasDepotOrders(v->schedule_ptr))
 		return;
 	
 	// Don't interfere with a depot visit scheduled by the user, or a
openttd-ottdgrfs