Went through the gui folder and revised the include statements to not

include anything not needed by that specific widget or window. This
appears to have cleaned up system performance a bit on my current setup,
where it went from idling on 45% in game with opengl down to 30% now.

Also moved iptostring to the tostring header, as importing all of
network.h is a little overkill to use that function, and it goes along
with the basic functions that are in that header file anyways. TODO:
find out a way to get rid of warnings when a class doesn't use this
function.

Signed-off-by: Ira Rice <irarice@gmail.com>

1 files changed, 18 insertions, 25 deletions

diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 36e33160..a58600a8 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -20,7 +20,6 @@
  */
 
 #include <algorithm>
-#include <fstream>
 
 #include <guichan/focushandler.hpp>
 
@@ -37,7 +36,6 @@
 
 #include "../beingmanager.h"
 #include "../configuration.h"
-#include "../extensions.h"
 #include "../game.h"
 #include "../localplayer.h"
 #include "../party.h"
@@ -538,32 +536,27 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
          * This will eventually be replaced by a GUI, so
          * we don't need to get too sophisticated
          */
-        if (extensions.aethyra_spells)
+        MessageOut outMsg(mNetwork);
+        if (msg == "heal")
         {
-            MessageOut outMsg(mNetwork);
-            if (msg == "heal")
-            {
-                outMsg.writeInt16(0x03f3);
-                outMsg.writeInt16(0x01);
-                outMsg.writeInt32(0);
-                outMsg.writeInt8(0);
-                outMsg.writeInt8(0);
-                outMsg.writeString("", 24);
-            }
-            else if (msg == "gather")
-            {
-                outMsg.writeInt16(0x03f3);
-                outMsg.writeInt16(0x02);
-                outMsg.writeInt32(0);
-                outMsg.writeInt8(0);
-                outMsg.writeInt8(0);
-                outMsg.writeString("", 24);
-            }
-            else
-                chatLog(_("No such spell!"), BY_SERVER);
+            outMsg.writeInt16(0x03f3);
+            outMsg.writeInt16(0x01);
+            outMsg.writeInt32(0);
+            outMsg.writeInt8(0);
+            outMsg.writeInt8(0);
+            outMsg.writeString("", 24);
+        }
+        else if (msg == "gather")
+        {
+            outMsg.writeInt16(0x03f3);
+            outMsg.writeInt16(0x02);
+            outMsg.writeInt32(0);
+            outMsg.writeInt8(0);
+            outMsg.writeInt8(0);
+            outMsg.writeString("", 24);
         }
         else
-            chatLog(_("The current server doesn't support spells"), BY_SERVER);
+            chatLog(_("No such spell!"), BY_SERVER);
     }
     else if (command == "present")
     {