Got rid of no longer used protocol.cpp

6 files changed, 12 insertions, 105 deletions

diff --git a/ChangeLog b/ChangeLog
index 2c1dd5ac..86ea7b87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-08-27  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/localplayer.cpp, src/gui/sell.cpp, src/gui/trade.cpp,
+	src/gui/char_select.cpp, src/gui/chat.cpp, src/gui/buy.cpp,
+	src/engine.cpp, src/beingmanager.cpp, src/npc.cpp,
+	src/net/messageout.cpp, src/net/messageout.h: Got rid of the default
+	MessageOut constructor, since all messages should have an ID.
+	* src/net/protocol.cpp, src/net/protocol.h, src/net/messagein.cpp,
+	src/net/playerhandler.cpp, src/Makefile.am: Got rid of no longer used
+	protocol.cpp.
+
 2006-08-26  Guillaume Melquiond  <guillaume.melquiond@gmail.com>
 
 	* src/localplayer.cpp, src/net/protocol.h: Send move message
@@ -9,14 +20,6 @@
 	tile-based coordinates to pixel-based coordinates (almost, they point
 	to tile centers for now).
 
-2006-08-27  Bjørn Lindeijer  <bjorn@lindeijer.nl>
-
-	* src/localplayer.cpp, src/gui/sell.cpp, src/gui/trade.cpp,
-	src/gui/char_select.cpp, src/gui/chat.cpp, src/gui/buy.cpp,
-	src/engine.cpp, src/beingmanager.cpp, src/npc.cpp,
-	src/net/messageout.cpp, src/net/messageout.h: Got rid of the default
-	MessageOut constructor, since all messages should have an ID.
-
 2006-08-26  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/gui/char_select.cpp, src/gui/playerbox.cpp, src/player.cpp,
diff --git a/src/Makefile.am b/src/Makefile.am
index 8f40c506..aac3a8d3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -148,7 +148,6 @@ tmw_SOURCES = graphic/imagerect.h \
 	      net/npchandler.h \
 	      net/playerhandler.cpp \
 	      net/playerhandler.h \
-	      net/protocol.cpp \
 	      net/protocol.h \
 	      net/skillhandler.cpp \
 	      net/skillhandler.h \
diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp
index 23ea8181..2c452a4d 100644
--- a/src/net/messagein.cpp
+++ b/src/net/messagein.cpp
@@ -90,7 +90,7 @@ std::string MessageIn::readString(int length)
         return "";
     }
 
-        // Read the string
+    // Read the string
     char const *stringBeg = mData + mPos,
                *stringEnd = (char const *)memchr(stringBeg, '\0', length);
     std::string readString(stringBeg, stringEnd ? stringEnd - stringBeg : length);
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index fc6bb37d..d21de6c4 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -283,19 +283,6 @@ void PlayerHandler::handleMessage(MessageIn &msg)
                 }
             }
             break;
-
-        //Stop walking
-        //case 0x0088:  // Disabled because giving some problems
-        //if (being = beingManager->findBeing(readLong(2))) {
-        //    if (being->getId() != player_node->getId()) {
-        //        being->action = STAND;
-        //        being->mFrame = 0;
-        //        set_coordinates(being->coordinates,
-        //                        readWord(6), readWord(8),
-        //                        get_direction(being->coordinates));
-        //    }
-        //}
-        //break;
     }
 }
 
diff --git a/src/net/protocol.cpp b/src/net/protocol.cpp
deleted file mode 100644
index d3db50bf..00000000
--- a/src/net/protocol.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
- */
-
-#include "protocol.h"
-
-#define LOBYTE(w)  ((unsigned char)(w))
-#define HIBYTE(w)  ((unsigned char)(((unsigned short)(w)) >> 8))
-
-void set_coordinates(char *data,
-                     unsigned short x,
-                     unsigned short y,
-                     unsigned char direction)
-{
-    short temp;
-    temp = x;
-    temp <<= 6;
-    data[0] = 0;
-    data[1] = 1;
-    data[2] = 2;
-    data[0] = HIBYTE(temp);
-    data[1] = (unsigned char)(temp);
-    temp = y;
-    temp <<= 4;
-    data[1] |= HIBYTE(temp);
-    data[2] = LOBYTE(temp);
-
-    // Translate direction to eAthena format
-    switch (direction)
-    {
-        case 1:
-            direction = 0;
-            break;
-        case 3:
-            direction = 1;
-            break;
-        case 2:
-            direction = 2;
-            break;
-        case 6:
-            direction = 3;
-            break;
-        case 4:
-            direction = 4;
-            break;
-        case 12:
-            direction = 5;
-            break;
-        case 8:
-            direction = 6;
-            break;
-        case 9:
-            direction = 7;
-            break;
-        default:
-            // OOPSIE! Impossible or unknown
-            direction = (unsigned char)-1;
-    }
-    data[2] |= direction;
-}
diff --git a/src/net/protocol.h b/src/net/protocol.h
index be6e27cb..d99351f2 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -223,7 +223,4 @@ enum {
     CREATE_TOO_MUCH_CHARACTERS
 };
 
-/** Encodes coords and direction in 3 bytes data */
-void set_coordinates(char *data, unsigned short x, unsigned short y, unsigned char direction);
-
 #endif