Tibia 10.79 support

jo3bingham · Jun 23, 2015 · 37fd5d0 · 37fd5d0
1 parent 7caa436
commit 37fd5d0
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 2 deletions.
diff --git a/SharpMapTracker/TibiaCastReader.cs b/SharpMapTracker/TibiaCastReader.cs
@@ -86,7 +86,7 @@ public void Read(string[] fileNames)
                         else if (minorVersion == 24)
                             client.Version = ClientVersion.Version1041;
                         else if (minorVersion == 30)
-                            client.Version = ClientVersion.Version1071;
+                            client.Version = ClientVersion.Version1079;
 
                         if(majorVersion != currentMajorVersion)
                         {

diff --git a/SharpTibiaProxy.v12.suo b/SharpTibiaProxy.v12.suo
diff --git a/SharpTibiaProxy/Domain/ClientVersion.cs b/SharpTibiaProxy/Domain/ClientVersion.cs
@@ -38,7 +38,8 @@ public class ClientVersion
         public static readonly ClientVersion Version1074 = new ClientVersion { Number = 1074, FileVersion = "10.7.4.0", OtbmVersion = 2, OtbMajorVersion = 3, OtbMinorVersion = 55 };
         public static readonly ClientVersion Version1075 = new ClientVersion { Number = 1075, FileVersion = "10.7.5.0", OtbmVersion = 2, OtbMajorVersion = 3, OtbMinorVersion = 55 };
         public static readonly ClientVersion Version1076 = new ClientVersion { Number = 1076, FileVersion = "10.7.6.0", OtbmVersion = 2, OtbMajorVersion = 3, OtbMinorVersion = 55 };
-        public static readonly ClientVersion Current = Version1076;
+        public static readonly ClientVersion Version1079 = new ClientVersion { Number = 1079, FileVersion = "10.7.9.0", OtbmVersion = 2, OtbMajorVersion = 3, OtbMinorVersion = 56 };
+        public static readonly ClientVersion Current = Version1079;
 
         public int Number { get; private set; }
         public string FileVersion { get; private set; }
@@ -83,6 +84,7 @@ public static ClientVersion GetFromFileVersion(string fileVersion)
                 case "10.7.4.0": return Version1074;
                 case "10.7.5.0": return Version1075;
                 case "10.7.6.0": return Version1076;
+                case "10.7.9.0": return Version1079;
                 default: return null;
             }
         }

diff --git a/SharpTibiaProxy/Network/ProtocolWorld.cs b/SharpTibiaProxy/Network/ProtocolWorld.cs
@@ -405,6 +405,9 @@ public void ParseServerMessage(InMessage message)
                         case 0xF3:
                             ParseServerChannelEvent(message);
                             break;
+                        case 0xF5:
+                            ParseServerPlayerInventory(message);
+                            break;
                         case 0xF6:
                             ParseServerMarketEnter(message);
                             break;
@@ -437,6 +440,18 @@ private double ReadDouble(InMessage message)
             return (loc3 - int.MaxValue) / Math.Pow(10, loc2);
         }
 
+        private void ParseServerPlayerInventory(InMessage message)
+        {
+            var count = message.ReadUShort();
+            while (count > 0)
+            {
+                message.ReadUShort();
+                message.ReadByte();
+                message.ReadUShort();
+                count--;
+            }
+        }
+
         private void ParseServerEditGuildMessage(InMessage message)
         {
             var guildMOTD = message.ReadString();

diff --git a/SharpTibiaProxy/Util/MemoryAddresses.cs b/SharpTibiaProxy/Util/MemoryAddresses.cs
@@ -570,6 +570,27 @@ public MemoryAddresses(Client client)
 
                 ClientBattleListStart = client.BaseAddress + 0x62C0D0;
             }
+            else if (client.Version == ClientVersion.Version1079)
+            {
+                ClientRsa = client.BaseAddress + 0x3899A0;
+                ClientServerStart = client.BaseAddress + 0x48F5FC;
+                ClientServerEnd = client.BaseAddress + 0x48F600;
+                ClientServerStep = 0x30;
+                ClientServerDistanceHostname = 0x04;
+                ClientServerDistanceIP = 0x1C;
+                ClientServerDistancePort = 0x28;
+                ClientServerMax = 10;
+                ClientSelectedCharacter = client.BaseAddress + 0x5D244C;
+                ClientMultiClient = client.BaseAddress + 0x158277;
+
+                ClientStatus = client.BaseAddress + 0x31CA38;//?
+
+                PlayerGoX = client.BaseAddress + 0x5D5030;
+                PlayerGoY = client.BaseAddress + 0x5D5028;
+                PlayerGoZ = client.BaseAddress + 0x5D5004;
+
+                ClientBattleListStart = client.BaseAddress + 0x62BF90;
+            }
             else
             {
                 throw new Exception("The client version " + client.Version + " is not supported.");