cpp/openttd-patchpack/source Changeset - r19376:dd573f88a83f

Changeset - r19376:dd573f88a83f

Parent rev.

Child rev.

[Not reviewed]

master

0 12 0

frosch - 12 years ago 2012-05-26 14:16:45
frosch@openttd.org

(svn r24291) -Add: [Script] ScriptEventRoadReconstruction.

12 files changed with 68 insertions and 0 deletions:

src/ai/ai_instance.cpp

src/game/game_instance.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/game/game_event_types.hpp.sq

src/script/api/game_changelog.hpp

src/script/api/script_event.hpp

src/script/api/script_event_types.hpp

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

src/town_cmd.cpp

0 comments (0 inline, 0 general)

src/ai/ai_instance.cpp

➞

Show inline comments

@@ @@ -137,6 +137,7 @@ void AIInstance::RegisterAPI() @@
 	SQAIEventExclusiveTransportRights_Register(this->engine);
 	SQAIEventIndustryClose_Register(this->engine);
 	SQAIEventIndustryOpen_Register(this->engine);
 	SQAIEventRoadReconstruction_Register(this->engine);
 	SQAIEventStationFirstVehicle_Register(this->engine);
 	SQAIEventSubsidyAwarded_Register(this->engine);
 	SQAIEventSubsidyExpired_Register(this->engine);

src/game/game_instance.cpp

➞

Show inline comments

@@ @@ -132,6 +132,7 @@ void GameInstance::RegisterAPI() @@
 	SQGSEventGoalQuestionAnswer_Register(this->engine);
 	SQGSEventIndustryClose_Register(this->engine);
 	SQGSEventIndustryOpen_Register(this->engine);
 	SQGSEventRoadReconstruction_Register(this->engine);
 	SQGSEventStationFirstVehicle_Register(this->engine);
 	SQGSEventSubsidyAwarded_Register(this->engine);
 	SQGSEventSubsidyExpired_Register(this->engine);

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

➞

Show inline comments

@@ @@ -49,6 +49,7 @@ void SQAIEvent_Register(Squirrel *engine @@
 	SQAIEvent.DefSQConst(engine, ScriptEvent::ET_WINDOW_WIDGET_CLICK,         "ET_WINDOW_WIDGET_CLICK");
 	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.DefSQMethod(engine, &ScriptEvent::GetEventType, "GetEventType", 1, "x");

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

➞

Show inline comments

@@ @@ -391,3 +391,17 @@ void SQAIEventExclusiveTransportRights_R @@
 	SQAIEventExclusiveTransportRights.PostRegister(engine);
+}
 template <> const char *GetClassName<ScriptEventRoadReconstruction, ST_AI>() { return "AIEventRoadReconstruction"; }
 void SQAIEventRoadReconstruction_Register(Squirrel *engine)
+{
 	DefSQClass<ScriptEventRoadReconstruction, ST_AI> SQAIEventRoadReconstruction("AIEventRoadReconstruction");
 	SQAIEventRoadReconstruction.PreRegister(engine, "AIEventCompanyTown");
 	SQAIEventRoadReconstruction.AddConstructor<void (ScriptEventRoadReconstruction::*)(ScriptCompany::CompanyID company, TownID town), 3>(engine, "xii");
 	SQAIEventRoadReconstruction.DefSQStaticMethod(engine, &ScriptEventRoadReconstruction::Convert, "Convert", 2, ".x");
 	SQAIEventRoadReconstruction.PostRegister(engine);
+}

src/script/api/ai_changelog.hpp

➞

Show inline comments

@@ @@ -21,6 +21,7 @@ @@
+ *
  * API additions:
  * \li AIEventExclusiveTransportRights
  * \li AIEventRoadReconstruction
  * \li AIStation::IsAirportClosed
  * \li AIStation::OpenCloseAirport
+ *

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

➞

Show inline comments

@@ @@ -49,6 +49,7 @@ void SQGSEvent_Register(Squirrel *engine @@
 	SQGSEvent.DefSQConst(engine, ScriptEvent::ET_WINDOW_WIDGET_CLICK,         "ET_WINDOW_WIDGET_CLICK");
 	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.DefSQMethod(engine, &ScriptEvent::GetEventType, "GetEventType", 1, "x");

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

➞

Show inline comments

@@ @@ -296,3 +296,17 @@ void SQGSEventExclusiveTransportRights_R @@
 	SQGSEventExclusiveTransportRights.PostRegister(engine);
+}
 template <> const char *GetClassName<ScriptEventRoadReconstruction, ST_GS>() { return "GSEventRoadReconstruction"; }
 void SQGSEventRoadReconstruction_Register(Squirrel *engine)
+{
 	DefSQClass<ScriptEventRoadReconstruction, ST_GS> SQGSEventRoadReconstruction("GSEventRoadReconstruction");
 	SQGSEventRoadReconstruction.PreRegister(engine, "GSEventCompanyTown");
 	SQGSEventRoadReconstruction.AddConstructor<void (ScriptEventRoadReconstruction::*)(ScriptCompany::CompanyID company, TownID town), 3>(engine, "xii");
 	SQGSEventRoadReconstruction.DefSQStaticMethod(engine, &ScriptEventRoadReconstruction::Convert, "Convert", 2, ".x");
 	SQGSEventRoadReconstruction.PostRegister(engine);
+}

src/script/api/game_changelog.hpp

➞

Show inline comments

@@ @@ -21,6 +21,7 @@ @@
+ *
  * API additions:
  * \li GSEventExclusiveTransportRights
  * \li GSEventRoadReconstruction
  * \li GSNews::NT_ACCIDENT, GSNews::NT_COMPANY_INFO, GSNews::NT_ADVICE, GSNews::NT_ACCEPTANCE
  * \li GSStation::IsAirportClosed
  * \li GSStation::OpenCloseAirport

src/script/api/script_event.hpp

➞

Show inline comments

@@ @@ -54,6 +54,7 @@ public: @@
 		ET_WINDOW_WIDGET_CLICK,
 		ET_GOAL_QUESTION_ANSWER,
 		ET_EXCLUSIVE_TRANSPORT_RIGHTS,
 		ET_ROAD_RECONSTRUCTION,
 	};
 	/**

src/script/api/script_event_types.hpp

➞

Show inline comments

@@ @@ -1044,5 +1044,27 @@ public: @@
 	static ScriptEventExclusiveTransportRights *Convert(ScriptEventCompanyTown *instance) { return (ScriptEventExclusiveTransportRights *)instance; }
 };
 /**
  * Event Road Reconstruction, indicating that company triggered
  * road reconstructions in a town.
  * @api ai game
  */
 class ScriptEventRoadReconstruction : public ScriptEventCompanyTown {
 public:
 	/**
 	 * @param company The company.
 	 * @param town The town.
 	 */
 	ScriptEventRoadReconstruction(ScriptCompany::CompanyID company, TownID town) :
 		ScriptEventCompanyTown(ET_ROAD_RECONSTRUCTION, company, town)
 	{}
 	/**
 	 * Convert an ScriptEvent to the real instance.
 	 * @param instance The instance to convert.
 	 * @return The converted instance.
 	 */
 	static ScriptEventRoadReconstruction *Convert(ScriptEventCompanyTown *instance) { return (ScriptEventRoadReconstruction *)instance; }
 };
 #endif /* SCRIPT_EVENT_TYPES_HPP */

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

➞

Show inline comments

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

src/town_cmd.cpp

➞

Show inline comments

@@ @@ -2701,6 +2701,8 @@ static CommandCost TownActionRoadRebuild @@
 		SetDParamStr(1, cn);
 		AddNewsItem(STR_NEWS_ROAD_REBUILDING, NT_GENERAL, NF_NORMAL, NR_TOWN, t->index, NR_NONE, UINT32_MAX, cn);
 		AI::BroadcastNewEvent(new ScriptEventRoadReconstruction((ScriptCompany::CompanyID)(Owner)_current_company, t->index));
 		Game::NewEvent(new ScriptEventRoadReconstruction((ScriptCompany::CompanyID)(Owner)_current_company, t->index));
+	}
 	return CommandCost();
+}

0 comments (0 inline, 0 general)