add bShallow argument for server-side water as well, fixes 9608

patrikjuvonen · patrikjuvonen · commit b7a5ec80b425 · 2018-07-15T17:41:46.000+03:00
diff --git a/Client/mods/deathmatch/logic/CPacketHandler.cpp b/Client/mods/deathmatch/logic/CPacketHandler.cpp
@@ -3902,14 +3902,18 @@ void CPacketHandler::Packet_EntityAdd(NetBitStreamInterface& bitStream)
                         vecVertices[i].fX = sX;
                         vecVertices[i].fY = sY;
                     }
+
+                    bool bShallow;
+                    bitStream.ReadBit(bShallow);
+
                     CClientWater* pWater = NULL;
                     if (ucNumVertices == 3)
                     {
-                        pWater = new CClientWater(g_pClientGame->GetManager(), EntityID, vecVertices[0], vecVertices[1], vecVertices[2]);
+                        pWater = new CClientWater(g_pClientGame->GetManager(), EntityID, vecVertices[0], vecVertices[1], vecVertices[2], bShallow);
                     }
                     else
                     {
-                        pWater = new CClientWater(g_pClientGame->GetManager(), EntityID, vecVertices[0], vecVertices[1], vecVertices[2], vecVertices[3]);
+                        pWater = new CClientWater(g_pClientGame->GetManager(), EntityID, vecVertices[0], vecVertices[1], vecVertices[2], vecVertices[3], bShallow);
                     }
                     if (!pWater->Exists())
                     {
diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp
@@ -63,7 +63,7 @@ void CLuaWaterDefs::AddClass(lua_State* luaVM)
 
 int CLuaWaterDefs::CreateWater(lua_State* luaVM)
 {
-    //  water createWater ( float x1, float y1, float z1, float x2, float y2, float z2, float x3, float y3, float z3 [, float x4, float y4, float z4 ] )
+    //  water createWater ( float x1, float y1, float z1, float x2, float y2, float z2, float x3, float y3, float z3 [, float x4, float y4, float z4 ] [, bool bShallow = false ] )
     CVector v1;
     CVector v2;
     CVector v3;
diff --git a/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
@@ -9055,12 +9055,12 @@ bool CStaticFunctionDefinitions::SetTeamFriendlyFire(CTeam* pTeam, bool bFriendl
     return false;
 }
 
-CWater* CStaticFunctionDefinitions::CreateWater(CResource* pResource, CVector* pV1, CVector* pV2, CVector* pV3, CVector* pV4)
+CWater* CStaticFunctionDefinitions::CreateWater(CResource* pResource, CVector* pV1, CVector* pV2, CVector* pV3, CVector* pV4, bool bShallow)
 {
     if (!pV1 || !pV2 || !pV3)
         return NULL;
 
-    CWater* pWater = m_pWaterManager->Create(pV4 ? CWater::QUAD : CWater::TRIANGLE, pResource->GetDynamicElementRoot());
+    CWater* pWater = m_pWaterManager->Create(pV4 ? CWater::QUAD : CWater::TRIANGLE, pResource->GetDynamicElementRoot(), NULL, bShallow);
 
     if (pWater)
     {
diff --git a/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.h b/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.h
@@ -521,7 +521,7 @@ class CStaticFunctionDefinitions
     static bool SetTeamFriendlyFire(CTeam* pTeam, bool bFriendlyFire);
 
     // Water funcs
-    static CWater* CreateWater(CResource* pResource, CVector* pV1, CVector* pV2, CVector* pV3, CVector* pV4);
+    static CWater* CreateWater(CResource* pResource, CVector* pV1, CVector* pV2, CVector* pV3, CVector* pV4, bool bShallow);
     static bool    SetElementWaterLevel(CWater* pWater, float fLevel);
     static bool    SetAllElementWaterLevel(float fLevel);
     static bool    SetWorldWaterLevel(float fLevel, bool bIncludeWorldNonSeaLevel);
diff --git a/Server/mods/deathmatch/logic/CWater.cpp b/Server/mods/deathmatch/logic/CWater.cpp
@@ -11,7 +11,7 @@
 
 #include "StdInc.h"
 
-CWater::CWater(CWaterManager* pWaterManager, CElement* pParent, CXMLNode* pNode, EWaterType waterType) : CElement(pParent, pNode)
+CWater::CWater(CWaterManager* pWaterManager, CElement* pParent, CXMLNode* pNode, EWaterType waterType, bool bShallow) : CElement(pParent, pNode)
 {
     m_pWaterManager = pWaterManager;
 
@@ -25,6 +25,8 @@ CWater::CWater(CWaterManager* pWaterManager, CElement* pParent, CXMLNode* pNode,
     if (m_WaterType == QUAD)
         m_Vertices[3] = CVector(10.0f, 10.0f, 0.0f);
 
+    m_bShallow = bShallow;
+
     if (m_pWaterManager)
         m_pWaterManager->AddToList(this);
 }
@@ -129,6 +131,9 @@ bool CWater::ReadSpecialData()
         }
     }
 
+    if (!GetCustomDataBool("shallow", m_bShallow, true))
+        m_bShallow = false;
+
     RoundVertices();
     if (!Valid())
     {
diff --git a/Server/mods/deathmatch/logic/CWater.h b/Server/mods/deathmatch/logic/CWater.h
@@ -22,7 +22,7 @@ class CWater : public CElement
         QUAD
     };
 
-    CWater(CWaterManager* pWaterManager, CElement* pParent, CXMLNode* pNode = NULL, EWaterType waterType = QUAD);
+    CWater(CWaterManager* pWaterManager, CElement* pParent, CXMLNode* pNode = NULL, EWaterType waterType = QUAD, bool bShallow = false);
     ~CWater();
 
     bool IsEntity() { return true; }
@@ -35,6 +35,7 @@ class CWater : public CElement
     void Unlink();
     bool ReadSpecialData();
 
+    bool       IsWaterShallow() const { return m_bShallow; }
     EWaterType GetWaterType() const { return m_WaterType; }
     int        GetNumVertices() const { return m_WaterType == TRIANGLE ? 3 : 4; }
     bool       GetVertex(int index, CVector& vecPosition) const;
@@ -51,4 +52,5 @@ class CWater : public CElement
 
     SFixedArray<CVector, 4> m_Vertices;
     EWaterType              m_WaterType;
+    bool                    m_bShallow;
 };
diff --git a/Server/mods/deathmatch/logic/CWaterManager.cpp b/Server/mods/deathmatch/logic/CWaterManager.cpp
@@ -24,9 +24,9 @@ CWaterManager::~CWaterManager()
     DeleteAll();
 }
 
-CWater* CWaterManager::Create(CWater::EWaterType waterType, CElement* pParent, CXMLNode* pNode)
+CWater* CWaterManager::Create(CWater::EWaterType waterType, CElement* pParent, CXMLNode* pNode, bool bShallow)
 {
-    CWater* pWater = new CWater(this, pParent, pNode, waterType);
+    CWater* pWater = new CWater(this, pParent, pNode, waterType, bShallow);
     if (pWater->GetID() == INVALID_ELEMENT_ID)
     {
         delete pWater;
diff --git a/Server/mods/deathmatch/logic/CWaterManager.h b/Server/mods/deathmatch/logic/CWaterManager.h
@@ -21,7 +21,7 @@ class CWaterManager
     CWaterManager();
     ~CWaterManager();
 
-    CWater* Create(CWater::EWaterType waterType, CElement* pParent, CXMLNode* Node = NULL);
+    CWater* Create(CWater::EWaterType waterType, CElement* pParent, CXMLNode* Node = NULL, bool bShallow = false);
     CWater* CreateFromXML(CElement* pParent, CXMLNode& Node, CEvents* pEvents);
     void    DeleteAll();
 
diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp
@@ -56,6 +56,7 @@ int CLuaWaterDefs::CreateWater(lua_State* luaVM)
 
     CVector          v1, v2, v3, v4;
     CVector*         pv4 = NULL;
+    bool             bShallow;
     CScriptArgReader argStream(luaVM);
     argStream.ReadVector3D(v1);
     argStream.ReadVector3D(v2);
@@ -67,9 +68,11 @@ int CLuaWaterDefs::CreateWater(lua_State* luaVM)
         pv4 = &v4;
     }
 
+    argStream.ReadBool(bShallow, false);
+
     if (!argStream.HasErrors())
     {
-        CWater* pWater = CStaticFunctionDefinitions::CreateWater(pLuaMain->GetResource(), &v1, &v2, &v3, pv4);
+        CWater* pWater = CStaticFunctionDefinitions::CreateWater(pLuaMain->GetResource(), &v1, &v2, &v3, pv4, bShallow);
         if (pWater)
         {
             CElementGroup* pGroup = pLuaMain->GetResource()->GetElementGroup();
diff --git a/Server/mods/deathmatch/logic/packets/CEntityAddPacket.cpp b/Server/mods/deathmatch/logic/packets/CEntityAddPacket.cpp
@@ -1050,6 +1050,7 @@ bool CEntityAddPacket::Write(NetBitStreamInterface& BitStream) const
                         BitStream.Write((short)vecVertex.fY);
                         BitStream.Write(vecVertex.fZ);
                     }
+                    BitStream.WriteBit(pWater->IsWaterShallow());
                     break;
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -3902,14 +3902,18 @@ void CPacketHandler::Packet_EntityAdd(NetBitStreamInterface& bitStream)`
`3902`	`3902`	`vecVertices[i].fX = sX;`
`3903`	`3903`	`vecVertices[i].fY = sY;`
`3904`	`3904`	`}`
	`3905`	`+`
	`3906`	`+ bool bShallow;`
	`3907`	`+ bitStream.ReadBit(bShallow);`
	`3908`	`+`
`3905`	`3909`	`CClientWater* pWater = NULL;`
`3906`	`3910`	`if (ucNumVertices == 3)`
`3907`	`3911`	`{`
`3908`		`- pWater = new CClientWater(g_pClientGame->GetManager(), EntityID, vecVertices[0], vecVertices[1], vecVertices[2]);`
	`3912`	`+ pWater = new CClientWater(g_pClientGame->GetManager(), EntityID, vecVertices[0], vecVertices[1], vecVertices[2], bShallow);`
`3909`	`3913`	`}`
`3910`	`3914`	`else`
`3911`	`3915`	`{`
`3912`		`- pWater = new CClientWater(g_pClientGame->GetManager(), EntityID, vecVertices[0], vecVertices[1], vecVertices[2], vecVertices[3]);`
	`3916`	`+ pWater = new CClientWater(g_pClientGame->GetManager(), EntityID, vecVertices[0], vecVertices[1], vecVertices[2], vecVertices[3], bShallow);`
`3913`	`3917`	`}`
`3914`	`3918`	`if (!pWater->Exists())`
`3915`	`3919`	`{`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ void CLuaWaterDefs::AddClass(lua_State* luaVM)`
`63`	`63`
`64`	`64`	`int CLuaWaterDefs::CreateWater(lua_State* luaVM)`
`65`	`65`	`{`
`66`		`- // water createWater ( float x1, float y1, float z1, float x2, float y2, float z2, float x3, float y3, float z3 [, float x4, float y4, float z4 ] )`
	`66`	`+ // water createWater ( float x1, float y1, float z1, float x2, float y2, float z2, float x3, float y3, float z3 [, float x4, float y4, float z4 ] [, bool bShallow = false ] )`
`67`	`67`	`CVector v1;`
`68`	`68`	`CVector v2;`
`69`	`69`	`CVector v3;`
Original file line number	Diff line number	Diff line change
`@@ -9055,12 +9055,12 @@ bool CStaticFunctionDefinitions::SetTeamFriendlyFire(CTeam* pTeam, bool bFriendl`
`9055`	`9055`	`return false;`
`9056`	`9056`	`}`
`9057`	`9057`
`9058`		`-CWater* CStaticFunctionDefinitions::CreateWater(CResource* pResource, CVector* pV1, CVector* pV2, CVector* pV3, CVector* pV4)`
	`9058`	`+CWater* CStaticFunctionDefinitions::CreateWater(CResource* pResource, CVector* pV1, CVector* pV2, CVector* pV3, CVector* pV4, bool bShallow)`
`9059`	`9059`	`{`
`9060`	`9060`	`if (!pV1 \|\| !pV2 \|\| !pV3)`
`9061`	`9061`	`return NULL;`
`9062`	`9062`
`9063`		`- CWater* pWater = m_pWaterManager->Create(pV4 ? CWater::QUAD : CWater::TRIANGLE, pResource->GetDynamicElementRoot());`
	`9063`	`+ CWater* pWater = m_pWaterManager->Create(pV4 ? CWater::QUAD : CWater::TRIANGLE, pResource->GetDynamicElementRoot(), NULL, bShallow);`
`9064`	`9064`
`9065`	`9065`	`if (pWater)`
`9066`	`9066`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`#include "StdInc.h"`
`13`	`13`
`14`		`-CWater::CWater(CWaterManager* pWaterManager, CElement* pParent, CXMLNode* pNode, EWaterType waterType) : CElement(pParent, pNode)`
	`14`	`+CWater::CWater(CWaterManager* pWaterManager, CElement* pParent, CXMLNode* pNode, EWaterType waterType, bool bShallow) : CElement(pParent, pNode)`
`15`	`15`	`{`
`16`	`16`	`m_pWaterManager = pWaterManager;`
`17`	`17`
`@@ -25,6 +25,8 @@ CWater::CWater(CWaterManager* pWaterManager, CElement* pParent, CXMLNode* pNode,`
`25`	`25`	`if (m_WaterType == QUAD)`
`26`	`26`	`m_Vertices[3] = CVector(10.0f, 10.0f, 0.0f);`
`27`	`27`
	`28`	`+ m_bShallow = bShallow;`
	`29`	`+`
`28`	`30`	`if (m_pWaterManager)`
`29`	`31`	`m_pWaterManager->AddToList(this);`
`30`	`32`	`}`
`@@ -129,6 +131,9 @@ bool CWater::ReadSpecialData()`
`129`	`131`	`}`
`130`	`132`	`}`
`131`	`133`
	`134`	`+ if (!GetCustomDataBool("shallow", m_bShallow, true))`
	`135`	`+ m_bShallow = false;`
	`136`	`+`
`132`	`137`	`RoundVertices();`
`133`	`138`	`if (!Valid())`
`134`	`139`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,9 @@ CWaterManager::~CWaterManager()`
`24`	`24`	`DeleteAll();`
`25`	`25`	`}`
`26`	`26`
`27`		`-CWater* CWaterManager::Create(CWater::EWaterType waterType, CElement* pParent, CXMLNode* pNode)`
	`27`	`+CWater* CWaterManager::Create(CWater::EWaterType waterType, CElement* pParent, CXMLNode* pNode, bool bShallow)`
`28`	`28`	`{`
`29`		`- CWater* pWater = new CWater(this, pParent, pNode, waterType);`
	`29`	`+ CWater* pWater = new CWater(this, pParent, pNode, waterType, bShallow);`
`30`	`30`	`if (pWater->GetID() == INVALID_ELEMENT_ID)`
`31`	`31`	`{`
`32`	`32`	`delete pWater;`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ int CLuaWaterDefs::CreateWater(lua_State* luaVM)`
`56`	`56`
`57`	`57`	`CVector v1, v2, v3, v4;`
`58`	`58`	`CVector* pv4 = NULL;`
	`59`	`+ bool bShallow;`
`59`	`60`	`CScriptArgReader argStream(luaVM);`
`60`	`61`	`argStream.ReadVector3D(v1);`
`61`	`62`	`argStream.ReadVector3D(v2);`
`@@ -67,9 +68,11 @@ int CLuaWaterDefs::CreateWater(lua_State* luaVM)`
`67`	`68`	`pv4 = &v4;`
`68`	`69`	`}`
`69`	`70`
	`71`	`+ argStream.ReadBool(bShallow, false);`
	`72`	`+`
`70`	`73`	`if (!argStream.HasErrors())`
`71`	`74`	`{`
`72`		`- CWater* pWater = CStaticFunctionDefinitions::CreateWater(pLuaMain->GetResource(), &v1, &v2, &v3, pv4);`
	`75`	`+ CWater* pWater = CStaticFunctionDefinitions::CreateWater(pLuaMain->GetResource(), &v1, &v2, &v3, pv4, bShallow);`
`73`	`76`	`if (pWater)`
`74`	`77`	`{`
`75`	`78`	`CElementGroup* pGroup = pLuaMain->GetResource()->GetElementGroup();`
Original file line number	Diff line number	Diff line change
`@@ -1050,6 +1050,7 @@ bool CEntityAddPacket::Write(NetBitStreamInterface& BitStream) const`
`1050`	`1050`	`BitStream.Write((short)vecVertex.fY);`
`1051`	`1051`	`BitStream.Write(vecVertex.fZ);`
`1052`	`1052`	`}`
	`1053`	`+ BitStream.WriteBit(pWater->IsWaterShallow());`
`1053`	`1054`	`break;`
`1054`	`1055`	`}`
`1055`	`1056`