Implement onAdd/onRemove script callback for vitcPacketReceiveNotific…

…ationObject.
fr1tz · Feb 5, 2016 · 93d7856 · 93d7856
1 parent b5f2f6a
commit 93d7856
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/Engine/source/VITC/net/vitcPacketReceiveNotificationObject.cpp b/Engine/source/VITC/net/vitcPacketReceiveNotificationObject.cpp
@@ -14,6 +14,10 @@
 
 IMPLEMENT_CONOBJECT(vitcPacketReceiveNotificationObject);
 
+IMPLEMENT_CALLBACK(vitcPacketReceiveNotificationObject, onAdd, void, (), (),
+	"Called when the object is registered with the system after the object has been created.");
+IMPLEMENT_CALLBACK(vitcPacketReceiveNotificationObject, onRemove, void, (), (),
+	"Called when the object is removed from the system before it is deleted.");
 IMPLEMENT_CALLBACK(vitcPacketReceiveNotificationObject, onPacketReceive, void, (const char* address, const char* base64data), (address, base64data),
    "@brief Called whenever a packet has been received.\n\n"
    "@param address Packet source address.\n"
@@ -35,7 +39,7 @@ bool vitcPacketReceiveNotificationObject::onAdd()
    if(!Parent::onAdd())
       return false;
 
-   const char *name = getName();
+   const char *name = this->getName();
 
    if(name && name[0] && getClassRep())
    {
@@ -44,9 +48,20 @@ bool vitcPacketReceiveNotificationObject::onAdd()
       mNameSpace = Con::lookupNamespace(name);
    }
 
+   // Notify Script.
+   onAdd_callback();
+
    return true;
 }
 
+void vitcPacketReceiveNotificationObject::onRemove()
+{
+	// Notify Script.
+	onRemove_callback();
+
+	Parent::onRemove();
+}
+
 void vitcPacketReceiveNotificationObject::processPacketReceiveEvent(NetAddress srcAddress, RawData packetData)
 {
 	char addrBuf[256];

diff --git a/Engine/source/VITC/net/vitcPacketReceiveNotificationObject.h b/Engine/source/VITC/net/vitcPacketReceiveNotificationObject.h
@@ -13,6 +13,8 @@
 class vitcPacketReceiveNotificationObject : public SimObject
 {
 public:
+	DECLARE_CALLBACK(void, onAdd, ());
+	DECLARE_CALLBACK(void, onRemove, ());
 	DECLARE_CALLBACK(void, onPacketReceive, (const char* address, const char* base64data));
 
 protected:
@@ -25,6 +27,7 @@ class vitcPacketReceiveNotificationObject : public SimObject
    void processPacketReceiveEvent(NetAddress srcAddress, RawData packetData);
 
    bool onAdd();
+   void onRemove();
 
    DECLARE_CONOBJECT(vitcPacketReceiveNotificationObject);
 };