Merge branch 'main' of https://github.com/RyzomApps/Ryzom-Console-Client

RyzomApps · Nov 6, 2024 · c1db728 · c1db728
2 parents e17212f + 2d27ed2
commit c1db728
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/Client/Entity/Entity.cs b/Client/Entity/Entity.cs
@@ -551,9 +551,9 @@ private void UpdateVisualPropertyPos(uint gameCycle, long prop, uint predictedIn
             }
 
             // Convert Database into a Position
-            var x = (float)(Convert.ToDouble(prop) / 1000.0f);
-            var y = nodeY.GetValue64() / 1000.0f;
-            var z = nodeZ.GetValue64() / 1000.0f;
+            var x = Convert.ToSingle(prop) / 1000.0f;
+            var y = Convert.ToSingle(nodeY.GetValue64()) / 1000.0f;
+            var z = Convert.ToSingle(nodeZ.GetValue64()) / 1000.0f;
 
             Pos = new Vector3(x, y, z);
 

diff --git a/Client/Network/NetworkManager.cs b/Client/Network/NetworkManager.cs
@@ -1148,7 +1148,7 @@ internal void ImpulseTp(BitMemoryStream impulse, bool hasSeason)
             }
 
             // Compute the destination.
-            var dest = new Vector3((float)x / 1000f, (float)y / 1000f, (float)z / 1000f);
+            var dest = new Vector3(x / 1000f, y / 1000f, z / 1000f);
 
             // Update the position for the vision.
             _client.GetNetworkManager().SetReferencePosition(dest);

diff --git a/Client/Property/PropertyDecoder.cs b/Client/Property/PropertyDecoder.cs
@@ -125,6 +125,7 @@ internal void Receive(int _, ActionPosition action)
                     // Absolute position
                     //nlinfo( "RefPos: %d %d %d RefBits: %hd %hd %hd", _RefPosX, _RefPosY, _RefPosZ, _RefBitsX, _RefBitsY, _RefBitsZ );
                     DecodeAbsPos2D(ref act.Position[0], ref act.Position[1], act.Position16[0], act.Position16[1]);
+
                     act.Position[2] = (short)act.Position16[2] << 4;
                     if (act.Interior)
                     {

diff --git a/Client/Stream/BitMemoryStream.cs b/Client/Stream/BitMemoryStream.cs
@@ -146,9 +146,13 @@ public void Serial(ref int obj)
         /// </summary>
         public void Serial(ref float obj)
         {
+            if (Constants.BitMemoryStreamDebugEnabled) _debugData.Add(new BitMemoryStreamSerialInfo(_bitPos, 32, BitMemoryStreamSerialInfo.SerialType.Buffer, new StackTrace(true)));
+
             if (IsReading())
             {
-                throw new NotImplementedException();
+                var newBits = ReadFromArray(32);
+                var reversed = ConvertBoolArrayToByteArray(newBits).Reverse().ToArray();
+                obj = BitConverter.ToSingle(reversed);
             }
             else
             {