Changeset 267

Timestamp:

Apr 28, 2016, 1:41:44 PM (9 years ago)

Author:

alloc

Message:

Update Chat stuff to 14.6 b26

Location:

binary-improvements

Files:

• 7dtd-server-fixes/src/API.cs (modified) (1 diff)
• 7dtd-server-fixes/src/ChatHookExample.cs (modified) (1 diff)
• AllocsCommands/Chat.cs (modified) (1 diff)
• MapRendering/API.cs (modified) (1 diff)
• MapRendering/Web/Handlers/ItemIconHandler.cs (modified) (3 diffs)
• server-fixes.userprefs (modified) (2 diffs)

binary-improvements/7dtd-server-fixes/src/API.cs

@@ -28 +28 @@
                 }
 
-                public override bool ChatMessage (ClientInfo _cInfo, string _message, string _playerName) {
-                        return ChatHookExample.Hook (_cInfo, _message, _playerName);
+                public override bool ChatMessage (ClientInfo _cInfo, EnumGameMessages _type, string _msg, string _mainName, bool _localizeMain, string _secondaryName, bool _localizeSecondary) {
+                        return ChatHookExample.Hook (_cInfo, _type, _msg, _mainName);
                 }
         }

binary-improvements/7dtd-server-fixes/src/ChatHookExample.cs

@@ -4 +4 @@
 {
         public class ChatHookExample {
-                private const string BBFILTER = "[ffffffff][/url][/b][/i][/u][/s][/sub][/sup][ff]";
                 private const string ANSWER = "     [ff0000]I[-] [ff7f00]W[-][ffff00]A[-][80ff00]S[-] [00ffff]H[-][0080ff]E[-][0000ff]R[-][8b00ff]E[-]";
 
-                public static bool Hook (ClientInfo _cInfo, string _message, string _playerName) {
+                public static bool Hook (ClientInfo _cInfo, EnumGameMessages _type, string _message, string _playerName) {
                         if (!string.IsNullOrEmpty (_message)) {
-                                if (_message.EndsWith (BBFILTER + BBFILTER)) {
-                                        _message = _message.Remove (_message.Length - 2 * BBFILTER.Length);
-                                }
-
                                 if (_message.ToLower () == "/alloc") {
                                         if (_cInfo != null) {
                                                 Log.Out ("Sent chat hook reply to {0}", _cInfo.playerId);
-                                                _cInfo.SendPackage (new NetPackageGameMessage (ANSWER, ""));
+                                                _cInfo.SendPackage (new NetPackageGameMessage (EnumGameMessages.Chat, ANSWER, "", false, "", false));
                                         } else {
                                                 Log.Error ("Argument _cInfo null on message: {0}", _message);

binary-improvements/AllocsCommands/Chat.cs

@@ -13 +13 @@
                                 senderName = "Server";
                         }
-                        _receiver.SendPackage (new NetPackageGameMessage (_message, senderName + " (PM)"));
+                        _receiver.SendPackage (new NetPackageGameMessage (EnumGameMessages.Chat, _message, senderName + " (PM)", false, "", false));
                         string receiverName = _receiver.playerName;
                         SdtdConsole.Instance.Output ("Message to player " + (receiverName != null ? "\"" + receiverName + "\"" : "unknownName") + " sent with sender \"" + senderName + "\"");

binary-improvements/MapRendering/API.cs

@@ -10 +10 @@
                 }
 
+//              public override void GameStartDone () {
+//                      if (AllocsFixes.NetConnections.Servers.Web.Handlers.ItemIconHandler.Instance != null) {
+//                              AllocsFixes.NetConnections.Servers.Web.Handlers.ItemIconHandler.Instance.LoadIcons ();
+//                      }
+//              }
+
                 public override void CalcChunkColorsDone (Chunk _chunk) {
                         AllocsFixes.MapRendering.MapRendering.RenderSingleChunk (_chunk);

binary-improvements/MapRendering/Web/Handlers/ItemIconHandler.cs

@@ -9 +9 @@
 {
         public class ItemIconHandler : PathHandler {
+                private static ItemIconHandler instance = null;
+                public static ItemIconHandler Instance {
+                        get { return instance; }
+                }
+
                 private string staticPart;
                 private bool logMissingFiles;
@@ -17 +22 @@
                         this.staticPart = staticPart;
                         this.logMissingFiles = logMissingFiles;
+                        ItemIconHandler.instance = this;
                 }
 
@@ -47 +53 @@
                 }
 
-                private bool LoadIcons () {
+                public bool LoadIcons () {
                         lock (icons) {
                                 if (loaded) {

binary-improvements/server-fixes.userprefs

@@ -1 +1 @@
 <Properties>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Release_Version" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="MapRendering/ModInfo.xml">
+  <MonoDevelop.Ide.Workbench ActiveDocument="MapRendering/API.cs">
     <Files>
       <File FileName="7dtd-server-fixes/ModInfo.xml" Line="1" Column="1" />
       <File FileName="AllocsCommands/ModInfo.xml" Line="1" Column="1" />
-      <File FileName="MapRendering/ModInfo.xml" Line="21" Column="21" />
-      <File FileName="MapRendering/Web/Web.cs" Line="1" Column="1" />
+      <File FileName="MapRendering/ModInfo.xml" Line="1" Column="1" />
+      <File FileName="MapRendering/Web/Web.cs" Line="10" Column="10" />
       <File FileName="MapRendering/Web/API/ExecuteConsoleCommand.cs" Line="1" Column="1" />
       <File FileName="MapRendering/Web/LogBuffer.cs" Line="1" Column="1" />
@@ -13 +13 @@
       <File FileName="MapRendering/Web/Handlers/ApiHandler.cs" Line="1" Column="1" />
       <File FileName="MapRendering/Commands/WebTokens.cs" Line="1" Column="1" />
-      <File FileName="AllocsCommands/Commands/TeleportPlayer.cs" Line="63" Column="63" />
-      <File FileName="MapRendering/Web/Handlers/ItemIconHandler.cs" Line="42" Column="42" />
+      <File FileName="AllocsCommands/Commands/TeleportPlayer.cs" Line="1" Column="1" />
+      <File FileName="MapRendering/Web/Handlers/ItemIconHandler.cs" Line="20" Column="20" />
+      <File FileName="MapRendering/API.cs" Line="1" Column="1" />
     </Files>
   </MonoDevelop.Ide.Workbench>