(svn r15027) -Merge: tomatos and bananas left to be, here is NoAI for all to see.

  NoAI is an API (a framework) to build your own AIs in. See:
   http://wiki.openttd.org/wiki/index.php/AI:Main_Page
 With many thanks to:
  - glx and Rubidium for their syncing, feedback and hard work
  - Yexo for his feedback, patches, and AIs which tested the system very deep
  - Morloth for his feedback and patches
  - TJIP for hosting a challenge which kept NoAI on track
  - All AI authors for testing our AI API, and all other people who helped in one way or another
-Remove: all old AIs and their cheats/hacks

1 files changed, 6 insertions, 3 deletions

diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index 86b07c7ff..f160a3280 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -51,6 +51,7 @@
 #include "depot_map.h"
 #include "animated_tile_func.h"
 #include "effectvehicle_base.h"
+#include "ai/ai.hpp"
 #include "core/alloc_func.hpp"
 #include "core/smallmap_type.hpp"
 #include "vehiclelist.h"
@@ -1518,6 +1519,7 @@ void VehicleEnterDepot(Vehicle *v)
 				SetDParam(0, v->index);
 				AddNewsItem(string, NS_ADVICE, v->index, 0);
 			}
+			AI::NewEvent(v->owner, new AIEventVehicleWaitingInDepot(v->index));
 		}
 	}
 }
@@ -2213,9 +2215,9 @@ void VehiclesYearlyLoop()
 	FOR_ALL_VEHICLES(v) {
 		if (v->IsPrimaryVehicle()) {
 			/* show warning if vehicle is not generating enough income last 2 years (corresponds to a red icon in the vehicle list) */
-			if (_settings_client.gui.vehicle_income_warn && v->owner == _local_company && v->age >= 730) {
-				Money profit = v->GetDisplayProfitThisYear();
-				if (profit < 0) {
+			Money profit = v->GetDisplayProfitThisYear();
+			if (v->age >= 730 && profit < 0) {
+				if (_settings_client.gui.vehicle_income_warn && v->owner == _local_company) {
 					SetDParam(0, v->index);
 					SetDParam(1, profit);
 					AddNewsItem(
@@ -2224,6 +2226,7 @@ void VehiclesYearlyLoop()
 						v->index,
 						0);
 				}
+				AI::NewEvent(v->owner, new AIEventVehicleUnprofitable(v->index));
 			}
 
 			v->profit_last_year = v->profit_this_year;