Merge branch 'dev' of https://github.com/arthuwu/HKCP into dev

Author: arthuwu

Constant.hpp

@@ -3,7 +3,7 @@
 #include <gdiplus.h>
 
 #define MY_PLUGIN_NAME      "HKCP"
-#define MY_PLUGIN_VERSION   "2.0.2"
+#define MY_PLUGIN_VERSION   "2.1.0"
 #define MY_PLUGIN_DEVELOPER "HKvACC, Jan Fries, Hendrik Peter, Sven Czarnian"
 #define MY_PLUGIN_COPYRIGHT "GPL v3"
 #define MY_PLUGIN_VIEW_AVISO  "Hong Kong Controller Plugin"
@@ -54,11 +54,16 @@ const int TAG_FUNC_RTE_SEL_DUMMY = 309;
 
 const int TAG_FUNC_CHECKFP_MENU = 100;
 const int TAG_FUNC_CHECKFP_CHECK = 101;
-const int TAG_FUNC_ON_OFF = 102;
+const int TAG_FUNC_VFPC_ON_OFF = 102;
 const int TAG_FUNC_CHECKFP_FLAS = 103;
 const int TAG_FUNC_FL_UP = 104;
 const int TAG_FUNC_FL_DOWN = 105;
 const int TAG_FUNC_MODRFL_MENU = 106;
+const int TAG_FUNC_ASSIGN_SID_MENU = 107;
+const int TAG_FUNC_ASSIGN_SID_AUTO = 108;
+const int TAG_FUNC_ASSIGN_SID_3RS = 109;
+const int TAG_FUNC_ASSIGN_SID_NAP = 110;
+const int TAG_FUNC_ASSIGN_SID_MANUAL = 111;
 
 const int DRAWING_APPWINDOW = 1211;
 const int ACK_BUTTON = 1212;

HKCP.cpp

@@ -106,15 +106,16 @@ CRadarScreen* HKCPPlugin::OnRadarScreenCreated(const char* sDisplayName, bool Ne
 	else {
 		SaveDataToSettings("PlaneIconScale", "PlaneIconScale", to_string(PlaneIconScale).c_str());
 	}
-
-	return new HKCPDisplay(CJSLabelSize, 
+	HKCPDisplay* Display = new HKCPDisplay(CJSLabelSize, 
 						   CJSLabelOffset, 
 						   CJSLabelShowWhenTracked, 
 						   PlaneIconScale, 
 						   sDisplayName, 
 						   colorAssumed, 
 						   colorNotAssumed, 
 						   colorRedundant);
+	VFPC->DisplayPtr = Display;
+	return Display;
 }
 
 void HKCPPlugin::OnFunctionCall(int FunctionId, const char* ItemString, POINT Pt, RECT Area) {
@@ -129,25 +130,38 @@ void HKCPPlugin::OnGetTagItem(CFlightPlan FlightPlan, CRadarTarget RadarTarget,
 
 void HKCPPlugin::OnFlightPlanControllerAssignedDataUpdate(CFlightPlan FlightPlan, int DataType) {
 	tags->OnFlightPlanControllerAssignedDataUpdate(FlightPlan, DataType);
+	VFPC->OnFlightPlanFlightPlanDataUpdate(FlightPlan);
+}
+
+void HKCPPlugin::OnFlightPlanFlightPlanDataUpdate(CFlightPlan FlightPlan)
+{
+	VFPC->OnFlightPlanFlightPlanDataUpdate(FlightPlan);
 }
 
 void HKCPPlugin::OnTimer(int Count) {
-	VFPC->OnTimer(Count);
+	//VFPC->OnTimer(Count);
 	tags->OnTimer(Count);
 }
 
 void HKCPPlugin::OnFlightPlanDisconnect(CFlightPlan FlightPlan) {
-	VFPC->OnFlightPlanDisconnect(FlightPlan);
+	//VFPC->OnFlightPlanDisconnect(FlightPlan);
 }
 
 bool HKCPPlugin::OnCompileCommand(const char* sCommandLine) {
-	return VFPC->OnCompileCommand(sCommandLine);
+	//return VFPC->OnCompileCommand(sCommandLine);
+	return false;
 }
 
 void HKCPPlugin::OnCompilePrivateChat(const char* sSenderCallsign, const char* sReceiverCallsign, const char* sChatMessage) {
 
 }
 
+void HKCPPlugin::OnAirportRunwayActivityChanged()
+{
+	VFPC->OnAirportRunwayActivityChanged();
+	Mapp->OnAirportRunwayActivityChanged();
+}
+
 //---EuroScopePlugInExit-----------------------------------------------
 
 void    __declspec (dllexport)    EuroScopePlugInExit(void)

HKCP.hpp

@@ -33,6 +33,8 @@ class HKCPPlugin :
 
 	virtual void OnFlightPlanControllerAssignedDataUpdate(CFlightPlan FlightPlan, int DataType);
 
+	virtual void OnFlightPlanFlightPlanDataUpdate(CFlightPlan FlightPlan);
+
 	virtual void OnFlightPlanDisconnect(CFlightPlan FlightPlan);
 
 	virtual bool OnCompileCommand(const char* sCommandLine);
@@ -41,6 +43,8 @@ class HKCPPlugin :
 
 	virtual void OnCompilePrivateChat(const char* sSenderCallsign, const char* sReceiverCallsign, const char* sChatMessage);
 
+	virtual void OnAirportRunwayActivityChanged();
+
 	COLORREF colorAssumed;
 	COLORREF colorNotAssumed;
 	COLORREF colorRedundant;