Fix #1539: Add on(Client)ElementDimensionChange event (#1553)

StrixG · web-flow · commit 7742f34b1fe9 · 2020-11-13T19:54:30.000+02:00
diff --git a/Client/mods/deathmatch/logic/CClientEntity.cpp b/Client/mods/deathmatch/logic/CClientEntity.cpp
@@ -593,6 +593,20 @@ void CClientEntity::SetRotationDegrees(const CVector& vecDegrees)
     SetRotationRadians(vecTemp);
 }
 
+void CClientEntity::SetDimension(unsigned short usDimension)
+{
+    if (m_usDimension == usDimension)
+        return;
+
+    unsigned int usOldDimension = m_usDimension;
+    m_usDimension = usDimension;
+
+    CLuaArguments Arguments;
+    Arguments.PushNumber(usOldDimension);
+    Arguments.PushNumber(usDimension);
+    CallEvent("onClientElementDimensionChange", Arguments, true);
+}
+
 bool CClientEntity::IsOutOfBounds()
 {
     CVector vecPosition;
diff --git a/Client/mods/deathmatch/logic/CClientEntity.h b/Client/mods/deathmatch/logic/CClientEntity.h
@@ -221,7 +221,7 @@ class CClientEntity : public CClientEntityBase
     virtual void SetRotationDegrees(const CVector& vecDegrees);
 
     virtual inline unsigned short GetDimension() { return m_usDimension; }
-    virtual void                  SetDimension(unsigned short usDimension) { m_usDimension = usDimension; }
+    virtual void                  SetDimension(unsigned short usDimension);
 
     virtual void ModelRequestCallback(CModelInfo* pModelInfo){};
 
diff --git a/Client/mods/deathmatch/logic/CClientGame.cpp b/Client/mods/deathmatch/logic/CClientGame.cpp
@@ -2772,6 +2772,7 @@ void CClientGame::AddBuiltInEvents()
     m_Events.AddEvent("onClientElementStreamOut", "", NULL, false);
     m_Events.AddEvent("onClientElementDestroy", "", NULL, false);
     m_Events.AddEvent("onClientElementModelChange", "oldModel, newModel", nullptr, false);
+    m_Events.AddEvent("onClientElementDimensionChange", "oldDimension, newDimension", nullptr, false);
 
     // Player events
     m_Events.AddEvent("onClientPlayerJoin", "", NULL, false);
diff --git a/Client/mods/deathmatch/logic/CClientPointLights.cpp b/Client/mods/deathmatch/logic/CClientPointLights.cpp
@@ -57,11 +57,11 @@ void CClientPointLights::DoPulse()
 
 void CClientPointLights::SetDimension(unsigned short usDimension)
 {
-    m_usDimension = usDimension;
+    CClientEntity::SetDimension(usDimension);
     RelateDimension(m_pPointLightsManager->GetDimension());
 }
 
 void CClientPointLights::RelateDimension(unsigned short usDimension)
 {
     m_bStreamedIn = (usDimension == m_usDimension);
-}
+}
diff --git a/Client/mods/deathmatch/logic/CClientRadarArea.cpp b/Client/mods/deathmatch/logic/CClientRadarArea.cpp
@@ -109,7 +109,7 @@ void CClientRadarArea::DoPulse(bool bRender)
 
 void CClientRadarArea::SetDimension(unsigned short usDimension)
 {
-    m_usDimension = usDimension;
+    CClientEntity::SetDimension(usDimension);
     RelateDimension(m_pRadarAreaManager->GetDimension());
 }
 
diff --git a/Client/mods/deathmatch/logic/CClientRadarArea.h b/Client/mods/deathmatch/logic/CClientRadarArea.h
@@ -46,7 +46,7 @@ class CClientRadarArea : public CClientEntity
 
     float GetAlphaFactor() const { return m_fAlphaFactor; };
 
-    void SetDimension(unsigned short usDimension);
+    void SetDimension(unsigned short usDimension) override;
     void RelateDimension(unsigned short usDimension);
 
 protected:
diff --git a/Client/mods/deathmatch/logic/CClientRadarMarker.cpp b/Client/mods/deathmatch/logic/CClientRadarMarker.cpp
@@ -242,7 +242,7 @@ void CClientRadarMarker::DestroyMarker()
 
 void CClientRadarMarker::SetDimension(unsigned short usDimension)
 {
-    m_usDimension = usDimension;
+    CClientEntity::SetDimension(usDimension);
     RelateDimension(m_pManager->GetRadarMarkerManager()->GetDimension());
 }
 
diff --git a/Client/mods/deathmatch/logic/CClientRadarMarker.h b/Client/mods/deathmatch/logic/CClientRadarMarker.h
@@ -51,7 +51,7 @@ class CClientRadarMarker : public CClientEntity
     bool IsVisible() const { return m_bIsVisible; };
     void SetVisible(bool bVisible);
 
-    void SetDimension(unsigned short usDimension);
+    void SetDimension(unsigned short usDimension) override;
     void RelateDimension(unsigned short usDimension);
 
     short GetOrdering() { return m_sOrdering; }
diff --git a/Client/mods/deathmatch/logic/CClientStreamElement.cpp b/Client/mods/deathmatch/logic/CClientStreamElement.cpp
@@ -154,7 +154,7 @@ void CClientStreamElement::SetDimension(unsigned short usDimension)
     if (m_usDimension != usDimension)
     {
         // Set the new dimension
-        m_usDimension = usDimension;
+        CClientEntity::SetDimension(usDimension);
 
         m_pStreamer->OnElementDimension(this);
     }
diff --git a/Client/mods/deathmatch/logic/CClientStreamElement.h b/Client/mods/deathmatch/logic/CClientStreamElement.h
@@ -40,7 +40,7 @@ class CClientStreamElement : public CClientEntity
     unsigned short          GetStreamReferences(bool bScript = false);
     unsigned long           GetTotalStreamReferences() { return m_usStreamReferences + m_usStreamReferencesScript; }
     void                    StreamOutForABit();
-    void                    SetDimension(unsigned short usDimension);
+    void                    SetDimension(unsigned short usDimension) override;
     float                   GetExpDistance() { return m_fExpDistance; }
     virtual CSphere         GetWorldBoundingSphere();
     float                   GetDistanceToBoundingBoxSquared(const CVector& vecPosition);
diff --git a/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
@@ -1292,7 +1292,6 @@ bool CStaticFunctionDefinitions::SetElementDimension(CClientEntity& Entity, unsi
         case CCLIENTWATER:
         {
             Entity.SetDimension(usDimension);
-
             return true;
         }
 
diff --git a/Server/mods/deathmatch/logic/CElement.cpp b/Server/mods/deathmatch/logic/CElement.cpp
@@ -1058,6 +1058,20 @@ void CElement::RemoveAllCollisions()
     m_Collisions.clear();
 }
 
+void CElement::SetDimension(unsigned short usDimension)
+{
+    if (m_usDimension == usDimension)
+        return;
+
+    unsigned short usOldDimension = m_usDimension;
+    m_usDimension = usDimension;
+
+    CLuaArguments Arguments;
+    Arguments.PushNumber(usOldDimension);
+    Arguments.PushNumber(usDimension);
+    CallEvent("onElementDimensionChange", Arguments);
+}
+
 CClient* CElement::GetClient()
 {
     CClient* pClient = NULL;
diff --git a/Server/mods/deathmatch/logic/CElement.h b/Server/mods/deathmatch/logic/CElement.h
@@ -182,7 +182,7 @@ class CElement
     std::list<class CColShape*>::iterator CollisionsEnd() { return m_Collisions.end(); }
 
     unsigned short GetDimension() { return m_usDimension; }
-    void           SetDimension(unsigned short usDimension) { m_usDimension = usDimension; }
+    virtual void   SetDimension(unsigned short usDimension);
 
     class CClient* GetClient();
 
diff --git a/Server/mods/deathmatch/logic/CGame.cpp b/Server/mods/deathmatch/logic/CGame.cpp
@@ -1534,6 +1534,7 @@ void CGame::AddBuiltInEvents()
     m_Events.AddEvent("onElementStartSync", "newSyncer", NULL, false);
     m_Events.AddEvent("onElementStopSync", "oldSyncer", NULL, false);
     m_Events.AddEvent("onElementModelChange", "oldModel, newModel", NULL, false);
+    m_Events.AddEvent("onElementDimensionChange", "oldDimension, newDimension", nullptr, false);
 
     // Radar area events
 

Original file line number	Diff line number	Diff line change
`@@ -57,11 +57,11 @@ void CClientPointLights::DoPulse()`
`57`	`57`
`58`	`58`	`void CClientPointLights::SetDimension(unsigned short usDimension)`
`59`	`59`	`{`
`60`		`- m_usDimension = usDimension;`
	`60`	`+ CClientEntity::SetDimension(usDimension);`
`61`	`61`	`RelateDimension(m_pPointLightsManager->GetDimension());`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`void CClientPointLights::RelateDimension(unsigned short usDimension)`
`65`	`65`	`{`
`66`	`66`	`m_bStreamedIn = (usDimension == m_usDimension);`
`67`		`-}`
	`67`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ void CClientRadarArea::DoPulse(bool bRender)`
`109`	`109`
`110`	`110`	`void CClientRadarArea::SetDimension(unsigned short usDimension)`
`111`	`111`	`{`
`112`		`- m_usDimension = usDimension;`
	`112`	`+ CClientEntity::SetDimension(usDimension);`
`113`	`113`	`RelateDimension(m_pRadarAreaManager->GetDimension());`
`114`	`114`	`}`
`115`	`115`
Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ void CClientRadarMarker::DestroyMarker()`
`242`	`242`
`243`	`243`	`void CClientRadarMarker::SetDimension(unsigned short usDimension)`
`244`	`244`	`{`
`245`		`- m_usDimension = usDimension;`
	`245`	`+ CClientEntity::SetDimension(usDimension);`
`246`	`246`	`RelateDimension(m_pManager->GetRadarMarkerManager()->GetDimension());`
`247`	`247`	`}`
`248`	`248`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ void CClientStreamElement::SetDimension(unsigned short usDimension)`
`154`	`154`	`if (m_usDimension != usDimension)`
`155`	`155`	`{`
`156`	`156`	`// Set the new dimension`
`157`		`- m_usDimension = usDimension;`
	`157`	`+ CClientEntity::SetDimension(usDimension);`
`158`	`158`
`159`	`159`	`m_pStreamer->OnElementDimension(this);`
`160`	`160`	`}`