Mercurial > hg > openttd

changeset 11018:09d43097ac2f draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r15358) -Add [NoAI]: AIEventVehicleCrashed::GetCrashReason()
author frosch <frosch@openttd.org>
date Thu, 05 Feb 2009 17:28:37 +0000
parents 0b644f70e88e
children 0cac02e58561
files src/ai/ai_instance.cpp src/ai/api/ai_event_types.hpp src/ai/api/ai_event_types.hpp.sq src/aircraft_cmd.cpp src/roadveh_cmd.cpp src/train_cmd.cpp
diffstat 6 files changed, 37 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/ai/ai_instance.cpp
+++ b/src/ai/ai_instance.cpp
@@ -221,6 +221,7 @@
 	SQAITunnel_Register(this->engine);
 	SQAIVehicle_Register(this->engine);
 	SQAIVehicleList_Register(this->engine);
+	SQAIVehicleList_SharedOrders_Register(this->engine);
 	SQAIVehicleList_Station_Register(this->engine);
 
 	this->engine->SetGlobalPointer(this->engine);
--- a/src/ai/api/ai_event_types.hpp
+++ b/src/ai/api/ai_event_types.hpp
@@ -24,13 +24,24 @@
 	static const char *GetClassName() { return "AIEventVehicleCrashed"; }
 
 	/**
+	 * The reasons for vehicle crashes
+	 */
+	enum CrashReason {
+		CRASH_TRAIN,                ///< Two trains collided
+		CRASH_RV_LEVEL_CROSSING,    ///< Road vehicle got under a train
+		CRASH_PLANE_LANDING,        ///< Plane crashed on landing
+		CRASH_AIRCRAFT_NO_AIRPORT,  ///< Aircraft crashed after it found not a single airport for landing
+	};
+
+	/**
 	 * @param vehicle The vehicle that crashed.
 	 * @param crash_site Where the vehicle crashed.
 	 */
-	AIEventVehicleCrashed(VehicleID vehicle, TileIndex crash_site) :
+	AIEventVehicleCrashed(VehicleID vehicle, TileIndex crash_site, CrashReason crash_reason) :
 		AIEvent(AI_ET_VEHICLE_CRASHED),
 		crash_site(crash_site),
-		vehicle(vehicle)
+		vehicle(vehicle),
+		crash_reason(crash_reason)
 	{}
 
 	/**
@@ -53,6 +64,12 @@
 	TileIndex GetCrashSite() { return crash_site; }
 
 	/**
+	 * Get the reason for crashing
+	 * @return The reason for crashing
+	 */
+	CrashReason GetCrashReason() { return crash_reason; }
+
+	/**
 	 * Clone the crashed vehicle and send it on its way again.
 	 * @param depot the depot to build the vehicle in.
 	 * @return True when the cloning succeeded.
@@ -63,6 +80,7 @@
 private:
 	TileIndex crash_site;
 	VehicleID vehicle;
+	CrashReason crash_reason;
 };
 
 /**
--- a/src/ai/api/ai_event_types.hpp.sq
+++ b/src/ai/api/ai_event_types.hpp.sq
@@ -4,6 +4,10 @@
 #include "ai_event_types.hpp"
 
 namespace SQConvert {
+	/* Allow enums to be used as Squirrel parameters */
+	template <> AIEventVehicleCrashed::CrashReason GetParam(ForceType<AIEventVehicleCrashed::CrashReason>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQInteger tmp; sq_getinteger(vm, index, &tmp); return (AIEventVehicleCrashed::CrashReason)tmp; }
+	template <> int Return<AIEventVehicleCrashed::CrashReason>(HSQUIRRELVM vm, AIEventVehicleCrashed::CrashReason res) { sq_pushinteger(vm, (int32)res); 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; }
@@ -16,11 +20,17 @@
 	DefSQClass <AIEventVehicleCrashed> SQAIEventVehicleCrashed("AIEventVehicleCrashed");
 	SQAIEventVehicleCrashed.PreRegister(engine, "AIEvent");
 
+	SQAIEventVehicleCrashed.DefSQConst(engine, AIEventVehicleCrashed::CRASH_TRAIN,               "CRASH_TRAIN");
+	SQAIEventVehicleCrashed.DefSQConst(engine, AIEventVehicleCrashed::CRASH_RV_LEVEL_CROSSING,   "CRASH_RV_LEVEL_CROSSING");
+	SQAIEventVehicleCrashed.DefSQConst(engine, AIEventVehicleCrashed::CRASH_PLANE_LANDING,       "CRASH_PLANE_LANDING");
+	SQAIEventVehicleCrashed.DefSQConst(engine, AIEventVehicleCrashed::CRASH_AIRCRAFT_NO_AIRPORT, "CRASH_AIRCRAFT_NO_AIRPORT");
+
 	SQAIEventVehicleCrashed.DefSQStaticMethod(engine, &AIEventVehicleCrashed::GetClassName, "GetClassName", 1, "x");
 	SQAIEventVehicleCrashed.DefSQStaticMethod(engine, &AIEventVehicleCrashed::Convert,      "Convert",      2, "xx");
 
 	SQAIEventVehicleCrashed.DefSQMethod(engine, &AIEventVehicleCrashed::GetVehicleID,        "GetVehicleID",        1, "x");
 	SQAIEventVehicleCrashed.DefSQMethod(engine, &AIEventVehicleCrashed::GetCrashSite,        "GetCrashSite",        1, "x");
+	SQAIEventVehicleCrashed.DefSQMethod(engine, &AIEventVehicleCrashed::GetCrashReason,      "GetCrashReason",      1, "x");
 	SQAIEventVehicleCrashed.DefSQMethod(engine, &AIEventVehicleCrashed::CloneCrashedVehicle, "CloneCrashedVehicle", 2, "xi");
 
 	SQAIEventVehicleCrashed.PostRegister(engine);
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -1323,14 +1323,17 @@
 	v->Next()->cargo.Truncate(0);
 	const Station *st = GetTargetAirportIfValid(v);
 	StringID newsitem;
+	AIEventVehicleCrashed::CrashReason crash_reason;
 	if (st == NULL) {
 		newsitem = STR_PLANE_CRASH_OUT_OF_FUEL;
+		crash_reason = AIEventVehicleCrashed::CRASH_AIRCRAFT_NO_AIRPORT;
 	} else {
 		SetDParam(1, st->index);
 		newsitem = STR_A034_PLANE_CRASH_DIE_IN_FIREBALL;
+		crash_reason = AIEventVehicleCrashed::CRASH_PLANE_LANDING;
 	}
 
-	AI::NewEvent(v->owner, new AIEventVehicleCrashed(v->index, v->tile));
+	AI::NewEvent(v->owner, new AIEventVehicleCrashed(v->index, v->tile, crash_reason));
 
 	AddNewsItem(newsitem,
 		NS_ACCIDENT_VEHICLE,
--- a/src/roadveh_cmd.cpp
+++ b/src/roadveh_cmd.cpp
@@ -600,7 +600,7 @@
 
 	InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH);
 
-	AI::NewEvent(v->owner, new AIEventVehicleCrashed(v->index, v->tile));
+	AI::NewEvent(v->owner, new AIEventVehicleCrashed(v->index, v->tile, AIEventVehicleCrashed::CRASH_RV_LEVEL_CROSSING));
 
 	SetDParam(0, pass);
 	AddNewsItem(
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -3584,7 +3584,7 @@
 	/* any dead -> no crash */
 	if (tcc.num == 0) return false;
 
-	AI::NewEvent(v->owner, new AIEventVehicleCrashed(v->index, v->tile));
+	AI::NewEvent(v->owner, new AIEventVehicleCrashed(v->index, v->tile, AIEventVehicleCrashed::CRASH_TRAIN));
 	SetDParam(0, tcc.num);
 	AddNewsItem(STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL,
 		NS_ACCIDENT_VEHICLE,