(svn r12610) [NoAI] -Fix: a subsidiary is a 'subcompany' and not the financial bonus for routes which is called a subsidy.
--- a/bin/ai/regression/regression.nut Mon Apr 07 14:00:52 2008 +0000
+++ b/bin/ai/regression/regression.nut Mon Apr 07 18:24:45 2008 +0000
@@ -1158,9 +1158,9 @@
print(" GetNextEvent: " + (e == null ? "null" : "instance"));
print(" GetEventType: " + e.GetEventType());
switch (e.GetEventType()) {
- case AIEvent.AI_ET_SUBSIDIARY_OFFER:
- local c = AIEventSubsidiaryOffer.Convert(e);
- print(" EventName: SubsidiaryOffer");
+ case AIEvent.AI_ET_SUBSIDY_OFFER:
+ local c = AIEventSubsidyOffer.Convert(e);
+ print(" EventName: SubsidyOffer");
print(" CargoID: " + c.GetCargoID());
print(" GetFromTownID: " + c.GetFromTownID());
print(" GetToTownID: " + c.GetToTownID());
--- a/bin/ai/regression/regression.txt Mon Apr 07 14:00:52 2008 +0000
+++ b/bin/ai/regression/regression.txt Mon Apr 07 18:24:45 2008 +0000
@@ -6316,7 +6316,7 @@
11 => 33417
GetNextEvent: instance
GetEventType: 3
- EventName: SubsidiaryOffer
+ EventName: SubsidyOffer
CargoID: 0
GetFromTownID: 24
GetToTownID: 65535
@@ -6324,7 +6324,7 @@
GetToIndustryID: 16
GetNextEvent: instance
GetEventType: 3
- EventName: SubsidiaryOffer
+ EventName: SubsidyOffer
CargoID: 0
GetFromTownID: 20
GetToTownID: 65535
@@ -6332,7 +6332,7 @@
GetToIndustryID: 6
GetNextEvent: instance
GetEventType: 3
- EventName: SubsidiaryOffer
+ EventName: SubsidyOffer
CargoID: 0
GetFromTownID: 21
GetToTownID: 65535
--- a/src/ai/ai_squirrel.cpp Mon Apr 07 14:00:52 2008 +0000
+++ b/src/ai/ai_squirrel.cpp Mon Apr 07 18:24:45 2008 +0000
@@ -230,7 +230,7 @@
SQAIError_Register(this->engine);
SQAIEvent_Register(this->engine);
SQAIEventController_Register(this->engine);
- SQAIEventSubsidiaryOffer_Register(this->engine);
+ SQAIEventSubsidyOffer_Register(this->engine);
SQAIEventTest_Register(this->engine);
SQAIEventVehicleCrash_Register(this->engine);
SQAIExecMode_Register(this->engine);
--- a/src/ai/api/ai_event.hpp Mon Apr 07 14:00:52 2008 +0000
+++ b/src/ai/api/ai_event.hpp Mon Apr 07 18:24:45 2008 +0000
@@ -23,7 +23,7 @@
AI_ET_INVALID = 0,
AI_ET_TEST,
AI_ET_CRASHED_VEHICLE,
- AI_ET_SUBSIDIARY_OFFER,
+ AI_ET_SUBSIDY_OFFER,
};
/**
--- a/src/ai/api/ai_event.hpp.sq Mon Apr 07 14:00:52 2008 +0000
+++ b/src/ai/api/ai_event.hpp.sq Mon Apr 07 18:24:45 2008 +0000
@@ -18,10 +18,10 @@
SQAIEvent.PreRegister(engine);
SQAIEvent.AddConstructor<void (AIEvent::*)(AIEvent::AIEventType type), 2>(engine, "xi");
- 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_SUBSIDIARY_OFFER, "AI_ET_SUBSIDIARY_OFFER");
+ 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.DefSQStaticMethod(engine, &AIEvent::GetClassName, "GetClassName", 1, "x");
--- a/src/ai/api/ai_event_types.hpp Mon Apr 07 14:00:52 2008 +0000
+++ b/src/ai/api/ai_event_types.hpp Mon Apr 07 18:24:45 2008 +0000
@@ -97,24 +97,24 @@
};
/**
- * Event Subsidiary Offered, indicating someone offered a subsidiary.
- * You can get the type of cargo the subsidiary is for, if it is between
+ * Event Subsidy Offered, indicating someone offered a subsidy.
+ * You can get the type of cargo the subsidy is for, if it is between
* towns or industry, and from where to where (which is either in TownID
* or IndustryID).
*/
-class AIEventSubsidiaryOffer : public AIEvent {
+class AIEventSubsidyOffer : public AIEvent {
public:
- static const char *GetClassName() { return "AIEventSubsidiaryOffer"; }
+ static const char *GetClassName() { return "AIEventSubsidyOffer"; }
/**
- * @param cargo The cargo for the subsidiary.
+ * @param cargo The cargo for the subsidy.
* @param from_town True if 'from' is a town, else it is an industry.
* @param from Either TownID or IndustryID to move the cargo from.
* @param to_town True if 'to' is a town, else it is an industry.
* @param to Either TownID or IndustryID to move the cargo to.
*/
- AIEventSubsidiaryOffer(CargoID cargo, bool from_town, uint32 from, bool to_town, uint32 to) :
- AIEvent(AI_ET_SUBSIDIARY_OFFER),
+ AIEventSubsidyOffer(CargoID cargo, bool from_town, uint32 from, bool to_town, uint32 to) :
+ AIEvent(AI_ET_SUBSIDY_OFFER),
cargo(cargo),
from_town(from_town),
from(from),
@@ -127,10 +127,10 @@
* @param instance The instance to convert.
* @return The converted instance.
*/
- static AIEventSubsidiaryOffer *Convert(AIEvent *instance) { return (AIEventSubsidiaryOffer *)instance; }
+ static AIEventSubsidyOffer *Convert(AIEvent *instance) { return (AIEventSubsidyOffer *)instance; }
/**
- * Get the CargoID of the subsidiary.
+ * Get the CargoID of the subsidy.
* @return The cargo type.
*/
CargoID GetCargoID() { return cargo; }
--- a/src/ai/api/ai_event_types.hpp.sq Mon Apr 07 14:00:52 2008 +0000
+++ b/src/ai/api/ai_event_types.hpp.sq Mon Apr 07 18:24:45 2008 +0000
@@ -47,27 +47,27 @@
}
namespace SQConvert {
- /* Allow AIEventSubsidiaryOffer to be used as Squirrel parameter */
- template <> AIEventSubsidiaryOffer *GetParam(ForceType<AIEventSubsidiaryOffer *>, HSQUIRRELVM vm, int index) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return (AIEventSubsidiaryOffer *)instance; }
- template <> AIEventSubsidiaryOffer &GetParam(ForceType<AIEventSubsidiaryOffer &>, HSQUIRRELVM vm, int index) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return *(AIEventSubsidiaryOffer *)instance; }
- template <> const AIEventSubsidiaryOffer *GetParam(ForceType<const AIEventSubsidiaryOffer *>, HSQUIRRELVM vm, int index) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return (AIEventSubsidiaryOffer *)instance; }
- template <> const AIEventSubsidiaryOffer &GetParam(ForceType<const AIEventSubsidiaryOffer &>, HSQUIRRELVM vm, int index) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return *(AIEventSubsidiaryOffer *)instance; }
- template <> int Return<AIEventSubsidiaryOffer *>(HSQUIRRELVM vm, AIEventSubsidiaryOffer *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIEventSubsidiaryOffer", res, NULL, DefSQDestructorCallback<AIEventSubsidiaryOffer>); return 1; }
+ /* Allow AIEventSubsidyOffer to be used as Squirrel parameter */
+ template <> AIEventSubsidyOffer *GetParam(ForceType<AIEventSubsidyOffer *>, HSQUIRRELVM vm, int index) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return (AIEventSubsidyOffer *)instance; }
+ template <> AIEventSubsidyOffer &GetParam(ForceType<AIEventSubsidyOffer &>, HSQUIRRELVM vm, int index) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return *(AIEventSubsidyOffer *)instance; }
+ template <> const AIEventSubsidyOffer *GetParam(ForceType<const AIEventSubsidyOffer *>, HSQUIRRELVM vm, int index) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return (AIEventSubsidyOffer *)instance; }
+ template <> const AIEventSubsidyOffer &GetParam(ForceType<const AIEventSubsidyOffer &>, HSQUIRRELVM vm, int index) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return *(AIEventSubsidyOffer *)instance; }
+ template <> int Return<AIEventSubsidyOffer *>(HSQUIRRELVM vm, AIEventSubsidyOffer *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AIEventSubsidyOffer", res, NULL, DefSQDestructorCallback<AIEventSubsidyOffer>); return 1; }
}; // namespace SQConvert
-void SQAIEventSubsidiaryOffer_Register(Squirrel *engine) {
- DefSQClass <AIEventSubsidiaryOffer> SQAIEventSubsidiaryOffer("AIEventSubsidiaryOffer");
- SQAIEventSubsidiaryOffer.PreRegister(engine, "AIEvent");
- SQAIEventSubsidiaryOffer.AddConstructor<void (AIEventSubsidiaryOffer::*)(CargoID cargo, bool from_town, uint32 from, bool to_town, uint32 to), 6>(engine, "xibibi");
-
- SQAIEventSubsidiaryOffer.DefSQStaticMethod(engine, &AIEventSubsidiaryOffer::GetClassName, "GetClassName", 1, "x");
- SQAIEventSubsidiaryOffer.DefSQStaticMethod(engine, &AIEventSubsidiaryOffer::Convert, "Convert", 2, "xx");
+void SQAIEventSubsidyOffer_Register(Squirrel *engine) {
+ DefSQClass <AIEventSubsidyOffer> SQAIEventSubsidyOffer("AIEventSubsidyOffer");
+ SQAIEventSubsidyOffer.PreRegister(engine, "AIEvent");
+ SQAIEventSubsidyOffer.AddConstructor<void (AIEventSubsidyOffer::*)(CargoID cargo, bool from_town, uint32 from, bool to_town, uint32 to), 6>(engine, "xibibi");
- SQAIEventSubsidiaryOffer.DefSQMethod(engine, &AIEventSubsidiaryOffer::GetCargoID, "GetCargoID", 1, "x");
- SQAIEventSubsidiaryOffer.DefSQMethod(engine, &AIEventSubsidiaryOffer::GetFromTownID, "GetFromTownID", 1, "x");
- SQAIEventSubsidiaryOffer.DefSQMethod(engine, &AIEventSubsidiaryOffer::GetToTownID, "GetToTownID", 1, "x");
- SQAIEventSubsidiaryOffer.DefSQMethod(engine, &AIEventSubsidiaryOffer::GetFromIndustryID, "GetFromIndustryID", 1, "x");
- SQAIEventSubsidiaryOffer.DefSQMethod(engine, &AIEventSubsidiaryOffer::GetToIndustryID, "GetToIndustryID", 1, "x");
+ SQAIEventSubsidyOffer.DefSQStaticMethod(engine, &AIEventSubsidyOffer::GetClassName, "GetClassName", 1, "x");
+ SQAIEventSubsidyOffer.DefSQStaticMethod(engine, &AIEventSubsidyOffer::Convert, "Convert", 2, "xx");
- SQAIEventSubsidiaryOffer.PostRegister(engine);
+ SQAIEventSubsidyOffer.DefSQMethod(engine, &AIEventSubsidyOffer::GetCargoID, "GetCargoID", 1, "x");
+ SQAIEventSubsidyOffer.DefSQMethod(engine, &AIEventSubsidyOffer::GetFromTownID, "GetFromTownID", 1, "x");
+ SQAIEventSubsidyOffer.DefSQMethod(engine, &AIEventSubsidyOffer::GetToTownID, "GetToTownID", 1, "x");
+ SQAIEventSubsidyOffer.DefSQMethod(engine, &AIEventSubsidyOffer::GetFromIndustryID, "GetFromIndustryID", 1, "x");
+ SQAIEventSubsidyOffer.DefSQMethod(engine, &AIEventSubsidyOffer::GetToIndustryID, "GetToIndustryID", 1, "x");
+
+ SQAIEventSubsidyOffer.PostRegister(engine);
}
--- a/src/economy.cpp Mon Apr 07 14:00:52 2008 +0000
+++ b/src/economy.cpp Mon Apr 07 18:24:45 2008 +0000
@@ -1174,7 +1174,7 @@
pair = SetupSubsidyDecodeParam(s, 0);
AddNewsItem(STR_2030_SERVICE_SUBSIDY_OFFERED, NM_NORMAL, NF_TILE, NT_SUBSIDIES, DNC_NONE, pair.a, pair.b);
for (PlayerID i = PLAYER_FIRST; i != MAX_PLAYERS; i++) {
- AI_Event(i, new AIEventSubsidiaryOffer(s->cargo_type, s->cargo_type == CT_PASSENGERS, s->from, (GetCargo(s->cargo_type)->town_effect == TE_GOODS || GetCargo(s->cargo_type)->town_effect == TE_FOOD), s->to));
+ AI_Event(i, new AIEventSubsidyOffer(s->cargo_type, s->cargo_type == CT_PASSENGERS, s->from, (GetCargo(s->cargo_type)->town_effect == TE_GOODS || GetCargo(s->cargo_type)->town_effect == TE_FOOD), s->to));
}
modified = true;
break;