cpp/openttd-patchpack/source Changeset - r23877:800799329701

Changeset - r23877:800799329701

Parent rev.

Child rev.

[Not reviewed]

master

0 9 0

glx - 5 years ago 2019-09-01 16:27:18
glx@openttd.org

Add: [Script] ScriptEventVehicleAutoReplaced.

9 files changed with 79 insertions and 1 deletions:

src/ai/ai_instance.cpp

src/autoreplace_cmd.cpp

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

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

src/script/api/ai_changelog.hpp

src/script/api/game/game_event.hpp.sq

src/script/api/script_event.hpp

src/script/api/script_event_types.hpp

src/script/api/template/template_event_types.hpp.sq

0 comments (0 inline, 0 general)

src/ai/ai_instance.cpp

➞

Show inline comments

@@ @@ -146,6 +146,7 @@ void AIInstance::RegisterAPI() @@
 	SQAIEventSubsidyOffer_Register(this->engine);
 	SQAIEventSubsidyOfferExpired_Register(this->engine);
 	SQAIEventTownFounded_Register(this->engine);
 	SQAIEventVehicleAutoReplaced_Register(this->engine);
 	SQAIEventVehicleCrashed_Register(this->engine);
 	SQAIEventVehicleLost_Register(this->engine);
 	SQAIEventVehicleUnprofitable_Register(this->engine);

src/autoreplace_cmd.cpp

➞

Show inline comments

@@ @@ -21,6 +21,7 @@ @@
 #include "core/random_func.hpp"
 #include "vehiclelist.h"
 #include "road.h"
 #include "ai/ai.hpp"
 #include "table/strings.h"
@@ @@ -419,6 +420,8 @@ static CommandCost ReplaceFreeUnit(Vehic @@
 			TransferCargo(old_v, new_v, false);
 			*single_unit = new_v;
 			AI::NewEvent(old_v->owner, new ScriptEventVehicleAutoReplaced(old_v->index, new_v->index));
+		}
 		/* Sell the old vehicle */
@@ @@ -587,7 +590,10 @@ static CommandCost ReplaceChain(Vehicle @@
 					cost.AddCost(DoCommand(0, w->index, 0, flags | DC_AUTOREPLACE, GetCmdSellVeh(w)));
 					if ((flags & DC_EXEC) != 0) {
 						old_vehs[i] = nullptr;
 						if (i == 0) old_head = nullptr;
 						if (i == 0) {
 							AI::NewEvent(old_head->owner, new ScriptEventVehicleAutoReplaced(old_head->index, new_head->index));
 							old_head = nullptr;
+						}
+					}
+				}
@@ @@ -641,6 +647,8 @@ static CommandCost ReplaceChain(Vehicle @@
 				if ((flags & DC_EXEC) != 0) {
 					TransferCargo(old_head, new_head, true);
 					*chain = new_head;
 					AI::NewEvent(old_head->owner, new ScriptEventVehicleAutoReplaced(old_head->index, new_head->index));
+				}
 				/* Sell the old vehicle */

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

➞

Show inline comments

@@ @@ -50,6 +50,7 @@ void SQAIEvent_Register(Squirrel *engine @@
 	SQAIEvent.DefSQConst(engine, ScriptEvent::ET_GOAL_QUESTION_ANSWER,        "ET_GOAL_QUESTION_ANSWER");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::ET_EXCLUSIVE_TRANSPORT_RIGHTS,  "ET_EXCLUSIVE_TRANSPORT_RIGHTS");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::ET_ROAD_RECONSTRUCTION,         "ET_ROAD_RECONSTRUCTION");
 	SQAIEvent.DefSQConst(engine, ScriptEvent::ET_VEHICLE_AUTOREPLACED,        "ET_VEHICLE_AUTOREPLACED");
 	SQAIEvent.DefSQMethod(engine, &ScriptEvent::GetEventType, "GetEventType", 1, "x");

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

➞

Show inline comments

@@ @@ -405,3 +405,19 @@ void SQAIEventRoadReconstruction_Registe @@
 	SQAIEventRoadReconstruction.PostRegister(engine);
+}
 template <> const char *GetClassName<ScriptEventVehicleAutoReplaced, ST_AI>() { return "AIEventVehicleAutoReplaced"; }
 void SQAIEventVehicleAutoReplaced_Register(Squirrel *engine)
+{
 	DefSQClass<ScriptEventVehicleAutoReplaced, ST_AI> SQAIEventVehicleAutoReplaced("AIEventVehicleAutoReplaced");
 	SQAIEventVehicleAutoReplaced.PreRegister(engine, "AIEvent");
 	SQAIEventVehicleAutoReplaced.DefSQStaticMethod(engine, &ScriptEventVehicleAutoReplaced::Convert, "Convert", 2, ".x");
 	SQAIEventVehicleAutoReplaced.DefSQMethod(engine, &ScriptEventVehicleAutoReplaced::GetOldVehicleID, "GetOldVehicleID", 1, "x");
 	SQAIEventVehicleAutoReplaced.DefSQMethod(engine, &ScriptEventVehicleAutoReplaced::GetNewVehicleID, "GetNewVehicleID", 1, "x");
 	SQAIEventVehicleAutoReplaced.PostRegister(engine);
+}

src/script/api/ai_changelog.hpp

➞

Show inline comments

@@ @@ -34,6 +34,7 @@ @@
  * \li AIEngine::CanRunOnRoad
  * \li AIEngine::HasPowerOnRoad
  * \li AIRoadTypeList::RoadTypeList
  * \li AIEventVehicleAutoReplaced
+ *
  * Other changes:
  * \li AITile::DemolishTile works without a selected company

src/script/api/game/game_event.hpp.sq

➞

Show inline comments

@@ @@ -50,6 +50,7 @@ void SQGSEvent_Register(Squirrel *engine @@
 	SQGSEvent.DefSQConst(engine, ScriptEvent::ET_GOAL_QUESTION_ANSWER,        "ET_GOAL_QUESTION_ANSWER");
 	SQGSEvent.DefSQConst(engine, ScriptEvent::ET_EXCLUSIVE_TRANSPORT_RIGHTS,  "ET_EXCLUSIVE_TRANSPORT_RIGHTS");
 	SQGSEvent.DefSQConst(engine, ScriptEvent::ET_ROAD_RECONSTRUCTION,         "ET_ROAD_RECONSTRUCTION");
 	SQGSEvent.DefSQConst(engine, ScriptEvent::ET_VEHICLE_AUTOREPLACED,        "ET_VEHICLE_AUTOREPLACED");
 	SQGSEvent.DefSQMethod(engine, &ScriptEvent::GetEventType, "GetEventType", 1, "x");

src/script/api/script_event.hpp

➞

Show inline comments

@@ @@ -55,6 +55,7 @@ public: @@
 		ET_GOAL_QUESTION_ANSWER,
 		ET_EXCLUSIVE_TRANSPORT_RIGHTS,
 		ET_ROAD_RECONSTRUCTION,
 		ET_VEHICLE_AUTOREPLACED,
 	};
 	/**

src/script/api/script_event_types.hpp

➞

Show inline comments

@@ @@ -1060,4 +1060,44 @@ public: @@
 	static ScriptEventRoadReconstruction *Convert(ScriptEventCompanyTown *instance) { return (ScriptEventRoadReconstruction *)instance; }
 };
 /**
  * Event VehicleAutoReplaced, indicating a vehicle has been auto replaced.
  * @api ai
  */
 class ScriptEventVehicleAutoReplaced : public ScriptEvent {
 public:
 	/**
 	 * @param old_id The vehicle that has been replaced.
 	 * @param new_id The vehicle that has been created in replacement.
 	 */
 	ScriptEventVehicleAutoReplaced(VehicleID old_id, VehicleID new_id) :
 		ScriptEvent(ET_VEHICLE_AUTOREPLACED),
 		old_id(old_id),
 		new_id(new_id)
 	{}
 	/**
 	 * Convert an ScriptEvent to the real instance.
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
 	static ScriptEventVehicleAutoReplaced *Convert(ScriptEvent *instance) { return (ScriptEventVehicleAutoReplaced *)instance; }
 	/**
 	 * Get the VehicleID of the vehicle that has been replaced.
 	 * @return The VehicleID of the vehicle that has been replaced. This ID is no longer valid for referencing the vehicle.
 	 */
 	VehicleID GetOldVehicleID() { return this->old_id; }
 	/**
 	 * Get the VehicleID of the vehicle that has been created in replacement.
 	 * @return The VehicleID of the vehicle that has been created in replacement.
 	 */
 	VehicleID GetNewVehicleID() { return this->new_id; }
 private:
 	VehicleID old_id; ///< The vehicle that has been replaced.
 	VehicleID new_id; ///< The vehicle that has been created in replacement.
 };
 #endif /* SCRIPT_EVENT_TYPES_HPP */

src/script/api/template/template_event_types.hpp.sq

➞

Show inline comments

@@ @@ -266,3 +266,12 @@ namespace SQConvert { @@
 	template <> inline const ScriptEventRoadReconstruction &GetParam(ForceType<const ScriptEventRoadReconstruction &>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return *(ScriptEventRoadReconstruction *)instance; }
 	template <> inline int Return<ScriptEventRoadReconstruction *>(HSQUIRRELVM vm, ScriptEventRoadReconstruction *res) { if (res == nullptr) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "EventRoadReconstruction", res, nullptr, DefSQDestructorCallback<ScriptEventRoadReconstruction>, true); return 1; }
 } // namespace SQConvert
 namespace SQConvert {
 	/* Allow ScriptEventVehicleAutoReplaced to be used as Squirrel parameter */
 	template <> inline ScriptEventVehicleAutoReplaced *GetParam(ForceType<ScriptEventVehicleAutoReplaced *>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return  (ScriptEventVehicleAutoReplaced *)instance; }
 	template <> inline ScriptEventVehicleAutoReplaced &GetParam(ForceType<ScriptEventVehicleAutoReplaced &>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return *(ScriptEventVehicleAutoReplaced *)instance; }
 	template <> inline const ScriptEventVehicleAutoReplaced *GetParam(ForceType<const ScriptEventVehicleAutoReplaced *>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return  (ScriptEventVehicleAutoReplaced *)instance; }
 	template <> inline const ScriptEventVehicleAutoReplaced &GetParam(ForceType<const ScriptEventVehicleAutoReplaced &>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return *(ScriptEventVehicleAutoReplaced *)instance; }
 	template <> inline int Return<ScriptEventVehicleAutoReplaced *>(HSQUIRRELVM vm, ScriptEventVehicleAutoReplaced *res) { if (res == nullptr) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "EventVehicleAutoReplaced", res, nullptr, DefSQDestructorCallback<ScriptEventVehicleAutoReplaced>, true); return 1; }
 } // namespace SQConvert

0 comments (0 inline, 0 general)