From 68a9446768cb195230cd04c59385280c6d384f19 Mon Sep 17 00:00:00 2001 From: suloku Date: Sat, 13 Mar 2021 21:00:24 +0100 Subject: [PATCH] Cleanup --- BW_tool/Editors/MemoryLink.cs | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/BW_tool/Editors/MemoryLink.cs b/BW_tool/Editors/MemoryLink.cs index 39bc038..b6ddb38 100644 --- a/BW_tool/Editors/MemoryLink.cs +++ b/BW_tool/Editors/MemoryLink.cs @@ -464,11 +464,7 @@ namespace BW_tool .Replace("\u0027", "\u2019") // farfetch'd .PadRight(value.Length + 1, (char)0xFFFF); // Null Terminator Encoding.Unicode.GetBytes(TempNick).CopyTo(Data, 0x48); -<<<<<<< HEAD Encoding.Unicode.GetBytes(TempNick).CopyTo(Data, 0x60); -======= - Encoding.Unicode.GetBytes(TempNick).CopyTo(Data, 0x60); ->>>>>>> c7a614e43c4d6acb87729f42682fbc8dc902cb2b Encoding.Unicode.GetBytes(TempNick).CopyTo(Data, 0x78); } } @@ -481,11 +477,7 @@ namespace BW_tool set { setData(BitConverter.GetBytes((UInt16)value), 0x44); -<<<<<<< HEAD setData(BitConverter.GetBytes((UInt16)value), 0x5C); -======= - setData(BitConverter.GetBytes((UInt16)value), 0x5C); ->>>>>>> c7a614e43c4d6acb87729f42682fbc8dc902cb2b setData(BitConverter.GetBytes((UInt16)value), 0x74); } } @@ -498,11 +490,7 @@ namespace BW_tool set { setData(BitConverter.GetBytes((UInt16)value), 0x46); -<<<<<<< HEAD setData(BitConverter.GetBytes((UInt16)value), 0x5E); -======= - setData(BitConverter.GetBytes((UInt16)value), 0x5E); ->>>>>>> c7a614e43c4d6acb87729f42682fbc8dc902cb2b setData(BitConverter.GetBytes((UInt16)value), 0x76); } }