--- a/bin/ai/regression/regression.txt	Sun Jun 22 12:12:04 2008 +0000
+++ b/bin/ai/regression/regression.txt	Sun Jun 22 16:01:48 2008 +0000
@@ -7206,7 +7206,7 @@
       EventName:         VehicleWaitingInDepot
       VehicleID:         11
   GetNextEvent:          instance
-    GetEventType:        3
+    GetEventType:        2
       EventName:         SubsidyOffer
       --Subsidy (0) --
         IsValidSubsidy():     true
@@ -7219,7 +7219,7 @@
         GetDestionation():    10
         GetCargoType():       0
   GetNextEvent:          instance
-    GetEventType:        3
+    GetEventType:        2
       EventName:         SubsidyOffer
       --Subsidy (1) --
         IsValidSubsidy():     true

--- a/bin/ai/wrightai/main.nut	Sun Jun 22 12:12:04 2008 +0000
+++ b/bin/ai/wrightai/main.nut	Sun Jun 22 16:01:48 2008 +0000
@@ -306,8 +306,8 @@
 	while (AIEventController.IsEventWaiting()) {
 		local e = AIEventController.GetNextEvent();
 		switch (e.GetEventType()) {
-			case AIEvent.AI_ET_CRASHED_VEHICLE:
-				local ec = AIEventVehicleCrash.Convert(e);
+			case AIEvent.AI_ET_VEHICLE_CRASHED:
+				local ec = AIEventVehicleCrashed.Convert(e);
 				local v = ec.GetVehicleID();
 				AILog.Info("We have a crashed vehicle (" + v + "), buying a new one as replacement");
 				this.BuildAircraft(this.route_1.GetValue(v), this.route_2.GetValue(v));

--- a/src/ai/api/ai_controller.cpp	Sun Jun 22 12:12:04 2008 +0000
+++ b/src/ai/api/ai_controller.cpp	Sun Jun 22 16:01:48 2008 +0000
@@ -113,7 +113,7 @@
 	SQAIEventSubsidyOffer_Register(this->engine);
 	SQAIEventSubsidyOfferExpired_Register(this->engine);
 	SQAIEventTest_Register(this->engine);
-	SQAIEventVehicleCrash_Register(this->engine);
+	SQAIEventVehicleCrashed_Register(this->engine);
 	SQAIEventVehicleLost_Register(this->engine);
 	SQAIEventVehicleUnprofitable_Register(this->engine);
 	SQAIEventVehicleWaitingInDepot_Register(this->engine);

--- a/src/ai/api/ai_event.hpp	Sun Jun 22 12:12:04 2008 +0000
+++ b/src/ai/api/ai_event.hpp	Sun Jun 22 16:01:48 2008 +0000
@@ -22,7 +22,6 @@
 	enum AIEventType {
 		AI_ET_INVALID = 0,
 		AI_ET_TEST,
-		AI_ET_CRASHED_VEHICLE,
 		AI_ET_SUBSIDY_OFFER,
 		AI_ET_SUBSIDY_OFFER_EXPIRED,
 		AI_ET_SUBSIDY_AWARDED,
@@ -32,6 +31,7 @@
 		AI_ET_COMPANY_IN_TROUBLE,
 		AI_ET_COMPANY_MERGER,
 		AI_ET_COMPANY_BANKRUPT,
+		AI_ET_VEHICLE_CRASHED,
 		AI_ET_VEHICLE_LOST,
 		AI_ET_VEHICLE_WAITING_IN_DEPOT,
 		AI_ET_VEHICLE_UNPROFITABLE,

--- a/src/ai/api/ai_event.hpp.sq	Sun Jun 22 12:12:04 2008 +0000
+++ b/src/ai/api/ai_event.hpp.sq	Sun Jun 22 16:01:48 2008 +0000
@@ -23,7 +23,6 @@
 
 	SQAIEvent.DefSQConst(engine, AIEvent::AI_ET_INVALID,                  "AI_ET_INVALID");
 	SQAIEvent.DefSQConst(engine, AIEvent::AI_ET_TEST,                     "AI_ET_TEST");
-	SQAIEvent.DefSQConst(engine, AIEvent::AI_ET_CRASHED_VEHICLE,          "AI_ET_CRASHED_VEHICLE");
 	SQAIEvent.DefSQConst(engine, AIEvent::AI_ET_SUBSIDY_OFFER,            "AI_ET_SUBSIDY_OFFER");
 	SQAIEvent.DefSQConst(engine, AIEvent::AI_ET_SUBSIDY_OFFER_EXPIRED,    "AI_ET_SUBSIDY_OFFER_EXPIRED");
 	SQAIEvent.DefSQConst(engine, AIEvent::AI_ET_SUBSIDY_AWARDED,          "AI_ET_SUBSIDY_AWARDED");
@@ -33,6 +32,7 @@
 	SQAIEvent.DefSQConst(engine, AIEvent::AI_ET_COMPANY_IN_TROUBLE,       "AI_ET_COMPANY_IN_TROUBLE");
 	SQAIEvent.DefSQConst(engine, AIEvent::AI_ET_COMPANY_MERGER,           "AI_ET_COMPANY_MERGER");
 	SQAIEvent.DefSQConst(engine, AIEvent::AI_ET_COMPANY_BANKRUPT,         "AI_ET_COMPANY_BANKRUPT");
+	SQAIEvent.DefSQConst(engine, AIEvent::AI_ET_VEHICLE_CRASHED,          "AI_ET_VEHICLE_CRASHED");
 	SQAIEvent.DefSQConst(engine, AIEvent::AI_ET_VEHICLE_LOST,             "AI_ET_VEHICLE_LOST");
 	SQAIEvent.DefSQConst(engine, AIEvent::AI_ET_VEHICLE_WAITING_IN_DEPOT, "AI_ET_VEHICLE_WAITING_IN_DEPOT");
 	SQAIEvent.DefSQConst(engine, AIEvent::AI_ET_VEHICLE_UNPROFITABLE,     "AI_ET_VEHICLE_UNPROFITABLE");

--- a/src/ai/api/ai_event_types.cpp	Sun Jun 22 12:12:04 2008 +0000
+++ b/src/ai/api/ai_event_types.cpp	Sun Jun 22 16:01:48 2008 +0000
@@ -14,7 +14,7 @@
 #include "../../articulated_vehicles.h"
 #include "table/strings.h"
 
-bool AIEventVehicleCrash::CloneCrashedVehicle(TileIndex depot)
+bool AIEventVehicleCrashed::CloneCrashedVehicle(TileIndex depot)
 {
 	return false;
 }

--- a/src/ai/api/ai_event_types.hpp	Sun Jun 22 12:12:04 2008 +0000
+++ b/src/ai/api/ai_event_types.hpp	Sun Jun 22 16:01:48 2008 +0000
@@ -52,16 +52,16 @@
  *  and orders as the crashed one. In case the vehicle type isn't available
  *  anymore, it will find the next best.
  */
-class AIEventVehicleCrash : public AIEvent {
+class AIEventVehicleCrashed : public AIEvent {
 public:
-	static const char *GetClassName() { return "AIEventVehicleCrash"; }
+	static const char *GetClassName() { return "AIEventVehicleCrashed"; }
 
 	/**
 	 * @param vehicle The vehicle that crashed.
 	 * @param crash_site Where the vehicle crashed.
 	 */
-	AIEventVehicleCrash(VehicleID vehicle, TileIndex crash_site) :
-		AIEvent(AI_ET_CRASHED_VEHICLE),
+	AIEventVehicleCrashed(VehicleID vehicle, TileIndex crash_site) :
+		AIEvent(AI_ET_VEHICLE_CRASHED),
 		crash_site(crash_site),
 		vehicle(vehicle)
 	{}
@@ -71,7 +71,7 @@
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
-	static AIEventVehicleCrash *Convert(AIEvent *instance) { return (AIEventVehicleCrash *)instance; }
+	static AIEventVehicleCrashed *Convert(AIEvent *instance) { return (AIEventVehicleCrashed *)instance; }
 
 	/**
 	 * Get the VehicleID of the crashed vehicle.

--- a/src/ai/api/ai_event_types.hpp.sq	Sun Jun 22 12:12:04 2008 +0000
+++ b/src/ai/api/ai_event_types.hpp.sq	Sun Jun 22 16:01:48 2008 +0000
@@ -25,26 +25,26 @@
 }
 
 namespace SQConvert {
-	/* Allow AIEventVehicleCrash to be used as Squirrel parameter */
-	template <> AIEventVehicleCrash *GetParam(ForceType<AIEventVehicleCrash *>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return  (AIEventVehicleCrash *)instance; }
-	template <> AIEventVehicleCrash &GetParam(ForceType<AIEventVehicleCrash &>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return *(AIEventVehicleCrash *)instance; }
-	template <> const AIEventVehicleCrash *GetParam(ForceType<const AIEventVehicleCrash *>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return  (AIEventVehicleCrash *)instance; }
-	template <> const AIEventVehicleCrash &GetParam(ForceType<const AIEventVehicleCrash &>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return *(AIEventVehicleCrash *)instance; }
-	template <> int Return<AIEventVehicleCrash *>(HSQUIRRELVM vm, AIEventVehicleCrash *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIEventVehicleCrash", res, NULL, DefSQDestructorCallback<AIEventVehicleCrash>); return 1; }
+	/* Allow AIEventVehicleCrashed to be used as Squirrel parameter */
+	template <> AIEventVehicleCrashed *GetParam(ForceType<AIEventVehicleCrashed *>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return  (AIEventVehicleCrashed *)instance; }
+	template <> AIEventVehicleCrashed &GetParam(ForceType<AIEventVehicleCrashed &>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return *(AIEventVehicleCrashed *)instance; }
+	template <> const AIEventVehicleCrashed *GetParam(ForceType<const AIEventVehicleCrashed *>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return  (AIEventVehicleCrashed *)instance; }
+	template <> const AIEventVehicleCrashed &GetParam(ForceType<const AIEventVehicleCrashed &>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return *(AIEventVehicleCrashed *)instance; }
+	template <> int Return<AIEventVehicleCrashed *>(HSQUIRRELVM vm, AIEventVehicleCrashed *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIEventVehicleCrashed", res, NULL, DefSQDestructorCallback<AIEventVehicleCrashed>); return 1; }
 }; // namespace SQConvert
 
-void SQAIEventVehicleCrash_Register(Squirrel *engine) {
-	DefSQClass <AIEventVehicleCrash> SQAIEventVehicleCrash("AIEventVehicleCrash");
-	SQAIEventVehicleCrash.PreRegister(engine, "AIEvent");
+void SQAIEventVehicleCrashed_Register(Squirrel *engine) {
+	DefSQClass <AIEventVehicleCrashed> SQAIEventVehicleCrashed("AIEventVehicleCrashed");
+	SQAIEventVehicleCrashed.PreRegister(engine, "AIEvent");
 
-	SQAIEventVehicleCrash.DefSQStaticMethod(engine, &AIEventVehicleCrash::GetClassName, "GetClassName", 1, "x");
-	SQAIEventVehicleCrash.DefSQStaticMethod(engine, &AIEventVehicleCrash::Convert,      "Convert",      2, "xx");
+	SQAIEventVehicleCrashed.DefSQStaticMethod(engine, &AIEventVehicleCrashed::GetClassName, "GetClassName", 1, "x");
+	SQAIEventVehicleCrashed.DefSQStaticMethod(engine, &AIEventVehicleCrashed::Convert,      "Convert",      2, "xx");
 
-	SQAIEventVehicleCrash.DefSQMethod(engine, &AIEventVehicleCrash::GetVehicleID,        "GetVehicleID",        1, "x");
-	SQAIEventVehicleCrash.DefSQMethod(engine, &AIEventVehicleCrash::GetCrashSite,        "GetCrashSite",        1, "x");
-	SQAIEventVehicleCrash.DefSQMethod(engine, &AIEventVehicleCrash::CloneCrashedVehicle, "CloneCrashedVehicle", 2, "xi");
+	SQAIEventVehicleCrashed.DefSQMethod(engine, &AIEventVehicleCrashed::GetVehicleID,        "GetVehicleID",        1, "x");
+	SQAIEventVehicleCrashed.DefSQMethod(engine, &AIEventVehicleCrashed::GetCrashSite,        "GetCrashSite",        1, "x");
+	SQAIEventVehicleCrashed.DefSQMethod(engine, &AIEventVehicleCrashed::CloneCrashedVehicle, "CloneCrashedVehicle", 2, "xi");
 
-	SQAIEventVehicleCrash.PostRegister(engine);
+	SQAIEventVehicleCrashed.PostRegister(engine);
 }
 
 namespace SQConvert {

--- a/src/aircraft_cmd.cpp	Sun Jun 22 12:12:04 2008 +0000
+++ b/src/aircraft_cmd.cpp	Sun Jun 22 16:01:48 2008 +0000
@@ -1399,7 +1399,7 @@
 		newsitem = STR_A034_PLANE_CRASH_DIE_IN_FIREBALL;
 	}
 
-	AI_Event(v->owner, new AIEventVehicleCrash(v->index, v->tile));
+	AI_Event(v->owner, new AIEventVehicleCrashed(v->index, v->tile));
 
 	SetDParam(1, st->index);
 	AddNewsItem(newsitem,

--- a/src/roadveh_cmd.cpp	Sun Jun 22 12:12:04 2008 +0000
+++ b/src/roadveh_cmd.cpp	Sun Jun 22 16:01:48 2008 +0000
@@ -661,7 +661,7 @@
 
 	InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH);
 
-	AI_Event(v->owner, new AIEventVehicleCrash(v->index, v->tile));
+	AI_Event(v->owner, new AIEventVehicleCrashed(v->index, v->tile));
 
 	SetDParam(0, pass);
 	AddNewsItem(

--- a/src/train_cmd.cpp	Sun Jun 22 12:12:04 2008 +0000
+++ b/src/train_cmd.cpp	Sun Jun 22 16:01:48 2008 +0000
@@ -2896,7 +2896,7 @@
 	/* any dead -> no crash */
 	if (tcc.num == 0) return;
 
-	AI_Event(v->owner, new AIEventVehicleCrash(v->index, v->tile));
+	AI_Event(v->owner, new AIEventVehicleCrashed(v->index, v->tile));
 	SetDParam(0, tcc.num);
 	AddNewsItem(STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL,
 		NS_ACCIDENT_VEHICLE,