cpp/openttd-patchpack/source Changeset - r18543:f76d4cf0daee

Changeset - r18543:f76d4cf0daee

Parent rev.

Child rev.

[Not reviewed]

master

0 8 0

truebrain - 13 years ago 2011-12-02 23:40:16
truebrain@openttd.org

(svn r23397) -Change: remove the AI_ prefix from all AIEvent enums

8 files changed with 140 insertions and 69 deletions:

bin/ai/compat_0.7.nut

bin/ai/compat_1.0.nut

bin/ai/compat_1.1.nut

bin/ai/regression/regression.nut

src/script/api/ai/ai_event.hpp.sq

src/script/api/ai_changelog.hpp

src/script/api/script_event.hpp

src/script/api/script_event_types.hpp

0 comments (0 inline, 0 general)

bin/ai/compat_0.7.nut

➞

Show inline comments

@@ @@ -325,6 +325,28 @@ AIRail.ERR_NONUNIFORM_STATIONS_DISABLED @@
 AICompany.GetCompanyValue <- function(company)
+{
 	return AICompany.GetQuarterlyCompanyValue(company, AICompany.CURRENT_QUARTER);
+}
 AITown.GetLastMonthTransported <- AITown.GetLastMonthSupplied;
 AIEvent.AI_ET_INVALID <- AIEvent.ET_INVALID;
 AIEvent.AI_ET_TEST <- AIEvent.ET_TEST;
 AIEvent.AI_ET_SUBSIDY_OFFER <- AIEvent.ET_SUBSIDY_OFFER;
 AIEvent.AI_ET_SUBSIDY_OFFER_EXPIRED <- AIEvent.ET_SUBSIDY_OFFER_EXPIRED;
 AIEvent.AI_ET_SUBSIDY_AWARDED <- AIEvent.ET_SUBSIDY_AWARDED;
 AIEvent.AI_ET_SUBSIDY_EXPIRED <- AIEvent.ET_SUBSIDY_EXPIRED;
 AIEvent.AI_ET_ENGINE_PREVIEW <- AIEvent.ET_ENGINE_PREVIEW;
 AIEvent.AI_ET_COMPANY_NEW <- AIEvent.ET_COMPANY_NEW;
 AIEvent.AI_ET_COMPANY_IN_TROUBLE <- AIEvent.ET_COMPANY_IN_TROUBLE;
 AIEvent.AI_ET_COMPANY_MERGER <- AIEvent.ET_COMPANY_MERGER;
 AIEvent.AI_ET_COMPANY_BANKRUPT <- AIEvent.ET_COMPANY_BANKRUPT;
 AIEvent.AI_ET_VEHICLE_CRASHED <- AIEvent.ET_VEHICLE_CRASHED;
 AIEvent.AI_ET_VEHICLE_LOST <- AIEvent.ET_VEHICLE_LOST;
 AIEvent.AI_ET_VEHICLE_WAITING_IN_DEPOT <- AIEvent.ET_VEHICLE_WAITING_IN_DEPOT;
 AIEvent.AI_ET_VEHICLE_UNPROFITABLE <- AIEvent.ET_VEHICLE_UNPROFITABLE;
 AIEvent.AI_ET_INDUSTRY_OPEN <- AIEvent.ET_INDUSTRY_OPEN;
 AIEvent.AI_ET_INDUSTRY_CLOSE <- AIEvent.ET_INDUSTRY_CLOSE;
 AIEvent.AI_ET_ENGINE_AVAILABLE <- AIEvent.ET_ENGINE_AVAILABLE;
 AIEvent.AI_ET_STATION_FIRST_VEHICLE <- AIEvent.ET_STATION_FIRST_VEHICLE;
 AIEvent.AI_ET_DISASTER_ZEPPELINER_CRASHED <- AIEvent.ET_DISASTER_ZEPPELINER_CRASHED;
 AIEvent.AI_ET_DISASTER_ZEPPELINER_CLEARED <- AIEvent.ET_DISASTER_ZEPPELINER_CLEARED;

bin/ai/compat_1.0.nut

➞

Show inline comments

@@ @@ -76,6 +76,29 @@ AIRail.ERR_NONUNIFORM_STATIONS_DISABLED @@
 AICompany.GetCompanyValue <- function(company)
+{
 	return AICompany.GetQuarterlyCompanyValue(company, AICompany.CURRENT_QUARTER);
+}
 AITown.GetLastMonthTransported <- AITown.GetLastMonthSupplied;
 AIEvent.AI_ET_INVALID <- AIEvent.ET_INVALID;
 AIEvent.AI_ET_TEST <- AIEvent.ET_TEST;
 AIEvent.AI_ET_SUBSIDY_OFFER <- AIEvent.ET_SUBSIDY_OFFER;
 AIEvent.AI_ET_SUBSIDY_OFFER_EXPIRED <- AIEvent.ET_SUBSIDY_OFFER_EXPIRED;
 AIEvent.AI_ET_SUBSIDY_AWARDED <- AIEvent.ET_SUBSIDY_AWARDED;
 AIEvent.AI_ET_SUBSIDY_EXPIRED <- AIEvent.ET_SUBSIDY_EXPIRED;
 AIEvent.AI_ET_ENGINE_PREVIEW <- AIEvent.ET_ENGINE_PREVIEW;
 AIEvent.AI_ET_COMPANY_NEW <- AIEvent.ET_COMPANY_NEW;
 AIEvent.AI_ET_COMPANY_IN_TROUBLE <- AIEvent.ET_COMPANY_IN_TROUBLE;
 AIEvent.AI_ET_COMPANY_ASK_MERGER <- AIEvent.ET_COMPANY_ASK_MERGER;
 AIEvent.AI_ET_COMPANY_MERGER <- AIEvent.ET_COMPANY_MERGER;
 AIEvent.AI_ET_COMPANY_BANKRUPT <- AIEvent.ET_COMPANY_BANKRUPT;
 AIEvent.AI_ET_VEHICLE_CRASHED <- AIEvent.ET_VEHICLE_CRASHED;
 AIEvent.AI_ET_VEHICLE_LOST <- AIEvent.ET_VEHICLE_LOST;
 AIEvent.AI_ET_VEHICLE_WAITING_IN_DEPOT <- AIEvent.ET_VEHICLE_WAITING_IN_DEPOT;
 AIEvent.AI_ET_VEHICLE_UNPROFITABLE <- AIEvent.ET_VEHICLE_UNPROFITABLE;
 AIEvent.AI_ET_INDUSTRY_OPEN <- AIEvent.ET_INDUSTRY_OPEN;
 AIEvent.AI_ET_INDUSTRY_CLOSE <- AIEvent.ET_INDUSTRY_CLOSE;
 AIEvent.AI_ET_ENGINE_AVAILABLE <- AIEvent.ET_ENGINE_AVAILABLE;
 AIEvent.AI_ET_STATION_FIRST_VEHICLE <- AIEvent.ET_STATION_FIRST_VEHICLE;
 AIEvent.AI_ET_DISASTER_ZEPPELINER_CRASHED <- AIEvent.ET_DISASTER_ZEPPELINER_CRASHED;
 AIEvent.AI_ET_DISASTER_ZEPPELINER_CLEARED <- AIEvent.ET_DISASTER_ZEPPELINER_CLEARED;

bin/ai/compat_1.1.nut

➞

Show inline comments

@@ @@ -12,6 +12,30 @@ AILog.Info("1.1 API compatability in eff @@
 AICompany.GetCompanyValue <- function(company)
+{
 	return AICompany.GetQuarterlyCompanyValue(company, AICompany.CURRENT_QUARTER);
+}
 AITown.GetLastMonthTransported <- AITown.GetLastMonthSupplied;
 AIEvent.AI_ET_INVALID <- AIEvent.ET_INVALID;
 AIEvent.AI_ET_TEST <- AIEvent.ET_TEST;
 AIEvent.AI_ET_SUBSIDY_OFFER <- AIEvent.ET_SUBSIDY_OFFER;
 AIEvent.AI_ET_SUBSIDY_OFFER_EXPIRED <- AIEvent.ET_SUBSIDY_OFFER_EXPIRED;
 AIEvent.AI_ET_SUBSIDY_AWARDED <- AIEvent.ET_SUBSIDY_AWARDED;
 AIEvent.AI_ET_SUBSIDY_EXPIRED <- AIEvent.ET_SUBSIDY_EXPIRED;
 AIEvent.AI_ET_ENGINE_PREVIEW <- AIEvent.ET_ENGINE_PREVIEW;
 AIEvent.AI_ET_COMPANY_NEW <- AIEvent.ET_COMPANY_NEW;
 AIEvent.AI_ET_COMPANY_IN_TROUBLE <- AIEvent.ET_COMPANY_IN_TROUBLE;
 AIEvent.AI_ET_COMPANY_ASK_MERGER <- AIEvent.ET_COMPANY_ASK_MERGER;
 AIEvent.AI_ET_COMPANY_MERGER <- AIEvent.ET_COMPANY_MERGER;
 AIEvent.AI_ET_COMPANY_BANKRUPT <- AIEvent.ET_COMPANY_BANKRUPT;
 AIEvent.AI_ET_VEHICLE_CRASHED <- AIEvent.ET_VEHICLE_CRASHED;
 AIEvent.AI_ET_VEHICLE_LOST <- AIEvent.ET_VEHICLE_LOST;
 AIEvent.AI_ET_VEHICLE_WAITING_IN_DEPOT <- AIEvent.ET_VEHICLE_WAITING_IN_DEPOT;
 AIEvent.AI_ET_VEHICLE_UNPROFITABLE <- AIEvent.ET_VEHICLE_UNPROFITABLE;
 AIEvent.AI_ET_INDUSTRY_OPEN <- AIEvent.ET_INDUSTRY_OPEN;
 AIEvent.AI_ET_INDUSTRY_CLOSE <- AIEvent.ET_INDUSTRY_CLOSE;
 AIEvent.AI_ET_ENGINE_AVAILABLE <- AIEvent.ET_ENGINE_AVAILABLE;
 AIEvent.AI_ET_STATION_FIRST_VEHICLE <- AIEvent.ET_STATION_FIRST_VEHICLE;
 AIEvent.AI_ET_DISASTER_ZEPPELINER_CRASHED <- AIEvent.ET_DISASTER_ZEPPELINER_CRASHED;
 AIEvent.AI_ET_DISASTER_ZEPPELINER_CLEARED <- AIEvent.ET_DISASTER_ZEPPELINER_CLEARED;
 AIEvent.AI_ET_TOWN_FOUNDED <- AIEvent.ET_TOWN_FOUNDED;

bin/ai/regression/regression.nut

➞

Show inline comments

@@ @@ -1856,19 +1856,19 @@ function Regression::Start() @@
 	while (AIEventController.IsEventWaiting()) {
 		local e = AIEventController.GetNextEvent();
 		print("  GetNextEvent:          " + (e == null ? "null" : "instance"));
 		print("    GetEventType:        " + e.GetEventType());
 		switch (e.GetEventType()) {
-			case AIEvent.AI_ET_SUBSIDY_OFFER: {
+			case AIEvent.ET_SUBSIDY_OFFER: {
 				local c = AIEventSubsidyOffer.Convert(e);
 				print("      EventName:         SubsidyOffer");
 				PrintSubsidy(c.GetSubsidyID());
 			} break;
-			case AIEvent.AI_ET_VEHICLE_WAITING_IN_DEPOT: {
+			case AIEvent.ET_VEHICLE_WAITING_IN_DEPOT: {
 				local c = AIEventVehicleWaitingInDepot.Convert(e);
 				print("      EventName:         VehicleWaitingInDepot");
 				print("      VehicleID:         " + c.GetVehicleID());
 			} break;
 			default:

src/script/api/ai/ai_event.hpp.sq

➞

Show inline comments

@@ @@ -18,35 +18,35 @@ template <> const char *GetClassName<Scr @@
 void SQAIEvent_Register(Squirrel *engine)
+{
 	DefSQClass<ScriptEvent, ST_AI> SQAIEvent("AIEvent");
 	SQAIEvent.PreRegister(engine);
 	SQAIEvent.AddConstructor<void (ScriptEvent::*)(ScriptEvent::ScriptEventType type), 2>(engine, "xi");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::AI_ET_INVALID,                     "AI_ET_INVALID");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::AI_ET_TEST,                        "AI_ET_TEST");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::AI_ET_SUBSIDY_OFFER,               "AI_ET_SUBSIDY_OFFER");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::AI_ET_SUBSIDY_OFFER_EXPIRED,       "AI_ET_SUBSIDY_OFFER_EXPIRED");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::AI_ET_SUBSIDY_AWARDED,             "AI_ET_SUBSIDY_AWARDED");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::AI_ET_SUBSIDY_EXPIRED,             "AI_ET_SUBSIDY_EXPIRED");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::AI_ET_ENGINE_PREVIEW,              "AI_ET_ENGINE_PREVIEW");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::AI_ET_COMPANY_NEW,                 "AI_ET_COMPANY_NEW");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::AI_ET_COMPANY_IN_TROUBLE,          "AI_ET_COMPANY_IN_TROUBLE");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::AI_ET_COMPANY_ASK_MERGER,          "AI_ET_COMPANY_ASK_MERGER");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::AI_ET_COMPANY_MERGER,              "AI_ET_COMPANY_MERGER");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::AI_ET_COMPANY_BANKRUPT,            "AI_ET_COMPANY_BANKRUPT");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::AI_ET_VEHICLE_CRASHED,             "AI_ET_VEHICLE_CRASHED");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::AI_ET_VEHICLE_LOST,                "AI_ET_VEHICLE_LOST");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::AI_ET_VEHICLE_WAITING_IN_DEPOT,    "AI_ET_VEHICLE_WAITING_IN_DEPOT");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::AI_ET_VEHICLE_UNPROFITABLE,        "AI_ET_VEHICLE_UNPROFITABLE");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::AI_ET_INDUSTRY_OPEN,               "AI_ET_INDUSTRY_OPEN");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::AI_ET_INDUSTRY_CLOSE,              "AI_ET_INDUSTRY_CLOSE");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::AI_ET_ENGINE_AVAILABLE,            "AI_ET_ENGINE_AVAILABLE");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::AI_ET_STATION_FIRST_VEHICLE,       "AI_ET_STATION_FIRST_VEHICLE");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::AI_ET_DISASTER_ZEPPELINER_CRASHED, "AI_ET_DISASTER_ZEPPELINER_CRASHED");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::AI_ET_DISASTER_ZEPPELINER_CLEARED, "AI_ET_DISASTER_ZEPPELINER_CLEARED");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::AI_ET_TOWN_FOUNDED,                "AI_ET_TOWN_FOUNDED");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::ET_INVALID,                     "ET_INVALID");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::ET_TEST,                        "ET_TEST");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::ET_SUBSIDY_OFFER,               "ET_SUBSIDY_OFFER");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::ET_SUBSIDY_OFFER_EXPIRED,       "ET_SUBSIDY_OFFER_EXPIRED");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::ET_SUBSIDY_AWARDED,             "ET_SUBSIDY_AWARDED");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::ET_SUBSIDY_EXPIRED,             "ET_SUBSIDY_EXPIRED");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::ET_ENGINE_PREVIEW,              "ET_ENGINE_PREVIEW");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::ET_COMPANY_NEW,                 "ET_COMPANY_NEW");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::ET_COMPANY_IN_TROUBLE,          "ET_COMPANY_IN_TROUBLE");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::ET_COMPANY_ASK_MERGER,          "ET_COMPANY_ASK_MERGER");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::ET_COMPANY_MERGER,              "ET_COMPANY_MERGER");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::ET_COMPANY_BANKRUPT,            "ET_COMPANY_BANKRUPT");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::ET_VEHICLE_CRASHED,             "ET_VEHICLE_CRASHED");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::ET_VEHICLE_LOST,                "ET_VEHICLE_LOST");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::ET_VEHICLE_WAITING_IN_DEPOT,    "ET_VEHICLE_WAITING_IN_DEPOT");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::ET_VEHICLE_UNPROFITABLE,        "ET_VEHICLE_UNPROFITABLE");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::ET_INDUSTRY_OPEN,               "ET_INDUSTRY_OPEN");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::ET_INDUSTRY_CLOSE,              "ET_INDUSTRY_CLOSE");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::ET_ENGINE_AVAILABLE,            "ET_ENGINE_AVAILABLE");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::ET_STATION_FIRST_VEHICLE,       "ET_STATION_FIRST_VEHICLE");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::ET_DISASTER_ZEPPELINER_CRASHED, "ET_DISASTER_ZEPPELINER_CRASHED");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::ET_DISASTER_ZEPPELINER_CLEARED, "ET_DISASTER_ZEPPELINER_CLEARED");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::ET_TOWN_FOUNDED,                "ET_TOWN_FOUNDED");
 	SQAIEvent.DefSQMethod(engine, &ScriptEvent::GetEventType, "GetEventType", 1, "x");
 	SQAIEvent.PostRegister(engine);
+}

src/script/api/ai_changelog.hpp

➞

Show inline comments

@@ @@ -44,12 +44,14 @@ @@
+ *
  * API renames:
  * \li AITown::GetLastMonthTransported to AITown::GetLastMonthSupplied to better
  *     reflect what it does.
  * \li AIInfo has all its configure settings renamed from AICONFIG to just CONFIG
  *     like CONFIG_RANDOM.
  * \li AIEvent has all its types renamed from AI_ET_ prefix to just ET_ prefix,
  *     like ET_SUBSIDY_OFFER.
+ *
  * API removals:
  * \li AICompany::GetCompanyValue, use AICompany::GetQuarterlyCompanyValue instead.
+ *
  * Other changes:
  * \li AITown::GetLastMonthProduction no longer has prerequisites based on town

src/script/api/script_event.hpp

➞

Show inline comments

@@ @@ -23,35 +23,35 @@ @@
 class ScriptEvent : public ScriptObject {
 public:
 	/**
 	 * The type of event. Needed to lookup the detailed class.
 	 */
 	enum ScriptEventType {
 		AI_ET_INVALID = 0,
 		AI_ET_TEST,
 		AI_ET_SUBSIDY_OFFER,
 		AI_ET_SUBSIDY_OFFER_EXPIRED,
 		AI_ET_SUBSIDY_AWARDED,
 		AI_ET_SUBSIDY_EXPIRED,
 		AI_ET_ENGINE_PREVIEW,
 		AI_ET_COMPANY_NEW,
 		AI_ET_COMPANY_IN_TROUBLE,
 		AI_ET_COMPANY_ASK_MERGER,
 		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,
 		AI_ET_INDUSTRY_OPEN,
 		AI_ET_INDUSTRY_CLOSE,
 		AI_ET_ENGINE_AVAILABLE,
 		AI_ET_STATION_FIRST_VEHICLE,
 		AI_ET_DISASTER_ZEPPELINER_CRASHED,
 		AI_ET_DISASTER_ZEPPELINER_CLEARED,
 		AI_ET_TOWN_FOUNDED,
 		ET_INVALID = 0,
 		ET_TEST,
 		ET_SUBSIDY_OFFER,
 		ET_SUBSIDY_OFFER_EXPIRED,
 		ET_SUBSIDY_AWARDED,
 		ET_SUBSIDY_EXPIRED,
 		ET_ENGINE_PREVIEW,
 		ET_COMPANY_NEW,
 		ET_COMPANY_IN_TROUBLE,
 		ET_COMPANY_ASK_MERGER,
 		ET_COMPANY_MERGER,
 		ET_COMPANY_BANKRUPT,
 		ET_VEHICLE_CRASHED,
 		ET_VEHICLE_LOST,
 		ET_VEHICLE_WAITING_IN_DEPOT,
 		ET_VEHICLE_UNPROFITABLE,
 		ET_INDUSTRY_OPEN,
 		ET_INDUSTRY_CLOSE,
 		ET_ENGINE_AVAILABLE,
 		ET_STATION_FIRST_VEHICLE,
 		ET_DISASTER_ZEPPELINER_CRASHED,
 		ET_DISASTER_ZEPPELINER_CLEARED,
 		ET_TOWN_FOUNDED,
 	};
 	/**
 	 * Constructor of ScriptEvent, to get the type of event.
 	 */
 	ScriptEvent(ScriptEvent::ScriptEventType type) :

src/script/api/script_event_types.hpp

➞

Show inline comments

@@ @@ -37,13 +37,13 @@ public: @@
 	/**
 	 * @param vehicle The vehicle that crashed.
 	 * @param crash_site Where the vehicle crashed.
 	 * @param crash_reason The reason why the vehicle crashed.
 	 */
 	ScriptEventVehicleCrashed(VehicleID vehicle, TileIndex crash_site, CrashReason crash_reason) :
-		ScriptEvent(AI_ET_VEHICLE_CRASHED),
+		ScriptEvent(ET_VEHICLE_CRASHED),
 		crash_site(crash_site),
 		vehicle(vehicle),
 		crash_reason(crash_reason)
 	{}
 	/**
@@ @@ -84,13 +84,13 @@ private: @@
 class ScriptEventSubsidyOffer : public ScriptEvent {
 public:
 	/**
 	 * @param subsidy_id The index of this subsidy in the _subsidies array.
 	 */
 	ScriptEventSubsidyOffer(SubsidyID subsidy_id) :
-		ScriptEvent(AI_ET_SUBSIDY_OFFER),
+		ScriptEvent(ET_SUBSIDY_OFFER),
 		subsidy_id(subsidy_id)
 	{}
 	/**
 	 * Convert an ScriptEvent to the real instance.
 	 * @param instance The instance to convert.
@@ @@ -115,13 +115,13 @@ private: @@
 class ScriptEventSubsidyOfferExpired : public ScriptEvent {
 public:
 	/**
 	 * @param subsidy_id The index of this subsidy in the _subsidies array.
 	 */
 	ScriptEventSubsidyOfferExpired(SubsidyID subsidy_id) :
-		ScriptEvent(AI_ET_SUBSIDY_OFFER_EXPIRED),
+		ScriptEvent(ET_SUBSIDY_OFFER_EXPIRED),
 		subsidy_id(subsidy_id)
 	{}
 	/**
 	 * Convert an ScriptEvent to the real instance.
 	 * @param instance The instance to convert.
@@ @@ -146,13 +146,13 @@ private: @@
 class ScriptEventSubsidyAwarded : public ScriptEvent {
 public:
 	/**
 	 * @param subsidy_id The index of this subsidy in the _subsidies array.
 	 */
 	ScriptEventSubsidyAwarded(SubsidyID subsidy_id) :
-		ScriptEvent(AI_ET_SUBSIDY_AWARDED),
+		ScriptEvent(ET_SUBSIDY_AWARDED),
 		subsidy_id(subsidy_id)
 	{}
 	/**
 	 * Convert an ScriptEvent to the real instance.
 	 * @param instance The instance to convert.
@@ @@ -177,13 +177,13 @@ private: @@
 class ScriptEventSubsidyExpired : public ScriptEvent {
 public:
 	/**
 	 * @param subsidy_id The index of this subsidy in the _subsidies array.
 	 */
 	ScriptEventSubsidyExpired(SubsidyID subsidy_id) :
-		ScriptEvent(AI_ET_SUBSIDY_EXPIRED),
+		ScriptEvent(ET_SUBSIDY_EXPIRED),
 		subsidy_id(subsidy_id)
 	{}
 	/**
 	 * Convert an ScriptEvent to the real instance.
 	 * @param instance The instance to convert.
@@ @@ -210,13 +210,13 @@ private: @@
 class ScriptEventEnginePreview : public ScriptEvent {
 public:
 	/**
 	 * @param engine The engine offered to test.
 	 */
 	ScriptEventEnginePreview(EngineID engine) :
-		ScriptEvent(AI_ET_ENGINE_PREVIEW),
+		ScriptEvent(ET_ENGINE_PREVIEW),
 		engine(engine)
 	{}
 	/**
 	 * Convert an ScriptEvent to the real instance.
 	 * @param instance The instance to convert.
@@ @@ -299,13 +299,13 @@ private: @@
 class ScriptEventCompanyNew : public ScriptEvent {
 public:
 	/**
 	 * @param owner The new company.
 	 */
 	ScriptEventCompanyNew(Owner owner) :
-		ScriptEvent(AI_ET_COMPANY_NEW),
+		ScriptEvent(ET_COMPANY_NEW),
 		owner((ScriptCompany::CompanyID)owner)
 	{}
 	/**
 	 * Convert an ScriptEvent to the real instance.
 	 * @param instance The instance to convert.
@@ @@ -331,13 +331,13 @@ private: @@
 class ScriptEventCompanyInTrouble : public ScriptEvent {
 public:
 	/**
 	 * @param owner The company that is in trouble.
 	 */
 	ScriptEventCompanyInTrouble(Owner owner) :
-		ScriptEvent(AI_ET_COMPANY_IN_TROUBLE),
+		ScriptEvent(ET_COMPANY_IN_TROUBLE),
 		owner((ScriptCompany::CompanyID)owner)
 	{}
 	/**
 	 * Convert an ScriptEvent to the real instance.
 	 * @param instance The instance to convert.
@@ @@ -363,13 +363,13 @@ class ScriptEventCompanyAskMerger : publ @@
 public:
 	/**
 	 * @param owner The company that can be bough.
 	 * @param value The value/costs of buying the company.
 	 */
 	ScriptEventCompanyAskMerger(Owner owner, int32 value) :
-		ScriptEvent(AI_ET_COMPANY_ASK_MERGER),
+		ScriptEvent(ET_COMPANY_ASK_MERGER),
 		owner((ScriptCompany::CompanyID)owner),
 		value(value)
 	{}
 	/**
 	 * Convert an ScriptEvent to the real instance.
@@ @@ -411,13 +411,13 @@ class ScriptEventCompanyMerger : public @@
 public:
 	/**
 	 * @param old_owner The company bought off.
 	 * @param new_owner The company that bougth owner.
 	 */
 	ScriptEventCompanyMerger(Owner old_owner, Owner new_owner) :
-		ScriptEvent(AI_ET_COMPANY_MERGER),
+		ScriptEvent(ET_COMPANY_MERGER),
 		old_owner((ScriptCompany::CompanyID)old_owner),
 		new_owner((ScriptCompany::CompanyID)new_owner)
 	{}
 	/**
 	 * Convert an ScriptEvent to the real instance.
@@ @@ -453,13 +453,13 @@ private: @@
 class ScriptEventCompanyBankrupt : public ScriptEvent {
 public:
 	/**
 	 * @param owner The company that has gone bankrupt.
 	 */
 	ScriptEventCompanyBankrupt(Owner owner) :
-		ScriptEvent(AI_ET_COMPANY_BANKRUPT),
+		ScriptEvent(ET_COMPANY_BANKRUPT),
 		owner((ScriptCompany::CompanyID)owner)
 	{}
 	/**
 	 * Convert an ScriptEvent to the real instance.
 	 * @param instance The instance to convert.
@@ @@ -484,13 +484,13 @@ private: @@
 class ScriptEventVehicleLost : public ScriptEvent {
 public:
 	/**
 	 * @param vehicle_id The vehicle that is lost.
 	 */
 	ScriptEventVehicleLost(VehicleID vehicle_id) :
-		ScriptEvent(AI_ET_VEHICLE_LOST),
+		ScriptEvent(ET_VEHICLE_LOST),
 		vehicle_id(vehicle_id)
 	{}
 	/**
 	 * Convert an ScriptEvent to the real instance.
 	 * @param instance The instance to convert.
@@ @@ -515,13 +515,13 @@ private: @@
 class ScriptEventVehicleWaitingInDepot : public ScriptEvent {
 public:
 	/**
 	 * @param vehicle_id The vehicle that is waiting in a depot.
 	 */
 	ScriptEventVehicleWaitingInDepot(VehicleID vehicle_id) :
-		ScriptEvent(AI_ET_VEHICLE_WAITING_IN_DEPOT),
+		ScriptEvent(ET_VEHICLE_WAITING_IN_DEPOT),
 		vehicle_id(vehicle_id)
 	{}
 	/**
 	 * Convert an ScriptEvent to the real instance.
 	 * @param instance The instance to convert.
@@ @@ -546,13 +546,13 @@ private: @@
 class ScriptEventVehicleUnprofitable : public ScriptEvent {
 public:
 	/**
 	 * @param vehicle_id The vehicle that was unprofitable.
 	 */
 	ScriptEventVehicleUnprofitable(VehicleID vehicle_id) :
-		ScriptEvent(AI_ET_VEHICLE_UNPROFITABLE),
+		ScriptEvent(ET_VEHICLE_UNPROFITABLE),
 		vehicle_id(vehicle_id)
 	{}
 	/**
 	 * Convert an ScriptEvent to the real instance.
 	 * @param instance The instance to convert.
@@ @@ -577,13 +577,13 @@ private: @@
 class ScriptEventIndustryOpen : public ScriptEvent {
 public:
 	/**
 	 * @param industry_id The new industry.
 	 */
 	ScriptEventIndustryOpen(IndustryID industry_id) :
-		ScriptEvent(AI_ET_INDUSTRY_OPEN),
+		ScriptEvent(ET_INDUSTRY_OPEN),
 		industry_id(industry_id)
 	{}
 	/**
 	 * Convert an ScriptEvent to the real instance.
 	 * @param instance The instance to convert.
@@ @@ -608,13 +608,13 @@ private: @@
 class ScriptEventIndustryClose : public ScriptEvent {
 public:
 	/**
 	 * @param industry_id The new industry.
 	 */
 	ScriptEventIndustryClose(IndustryID industry_id) :
-		ScriptEvent(AI_ET_INDUSTRY_CLOSE),
+		ScriptEvent(ET_INDUSTRY_CLOSE),
 		industry_id(industry_id)
 	{}
 	/**
 	 * Convert an ScriptEvent to the real instance.
 	 * @param instance The instance to convert.
@@ @@ -639,13 +639,13 @@ private: @@
 class ScriptEventEngineAvailable : public ScriptEvent {
 public:
 	/**
 	 * @param engine The engine that is available.
 	 */
 	ScriptEventEngineAvailable(EngineID engine) :
-		ScriptEvent(AI_ET_ENGINE_AVAILABLE),
+		ScriptEvent(ET_ENGINE_AVAILABLE),
 		engine(engine)
 	{}
 	/**
 	 * Convert an ScriptEvent to the real instance.
 	 * @param instance The instance to convert.
@@ @@ -671,13 +671,13 @@ class ScriptEventStationFirstVehicle : p @@
 public:
 	/**
 	 * @param station The station visited for the first time.
 	 * @param vehicle The vehicle visiting the station.
 	 */
 	ScriptEventStationFirstVehicle(StationID station, VehicleID vehicle) :
-		ScriptEvent(AI_ET_STATION_FIRST_VEHICLE),
+		ScriptEvent(ET_STATION_FIRST_VEHICLE),
 		station(station),
 		vehicle(vehicle)
 	{}
 	/**
 	 * Convert an ScriptEvent to the real instance.
@@ @@ -710,13 +710,13 @@ private: @@
 class ScriptEventDisasterZeppelinerCrashed : public ScriptEvent {
 public:
 	/**
 	 * @param station The station containing the affected airport
 	 */
 	ScriptEventDisasterZeppelinerCrashed(StationID station) :
-		ScriptEvent(AI_ET_DISASTER_ZEPPELINER_CRASHED),
+		ScriptEvent(ET_DISASTER_ZEPPELINER_CRASHED),
 		station(station)
 	{}
 	/**
 	 * Convert an ScriptEvent to the real instance.
 	 * @param instance The instance to convert.
@@ @@ -741,13 +741,13 @@ private: @@
 class ScriptEventDisasterZeppelinerCleared : public ScriptEvent {
 public:
 	/**
 	 * @param station The station containing the affected airport
 	 */
 	ScriptEventDisasterZeppelinerCleared(StationID station) :
-		ScriptEvent(AI_ET_DISASTER_ZEPPELINER_CLEARED),
+		ScriptEvent(ET_DISASTER_ZEPPELINER_CLEARED),
 		station(station)
 	{}
 	/**
 	 * Convert an ScriptEvent to the real instance.
 	 * @param instance The instance to convert.
@@ @@ -772,13 +772,13 @@ private: @@
 class ScriptEventTownFounded : public ScriptEvent {
 public:
 	/**
 	 * @param town The town that was created.
 	 */
 	ScriptEventTownFounded(TownID town) :
-		ScriptEvent(AI_ET_TOWN_FOUNDED),
+		ScriptEvent(ET_TOWN_FOUNDED),
 		town(town)
 	{}
 	/**
 	 * Convert an ScriptEvent to the real instance.
 	 * @param instance The instance to convert.

0 comments (0 inline, 0 general)