From bad6cc2fabfff41fdc3314a6d9dcaacc4bffd45d Mon Sep 17 00:00:00 2001
From: Kayne Ruse <ratstail91@yahoo.com.au>
Date: Thu, 5 Feb 2015 23:06:22 +1100
Subject: [PATCH] Moved ip_operators.*pp to common/utilities

---
 client/gameplay_scenes/in_world_monsters.cpp         |  4 ++--
 .../utilities}/ip_operators.cpp                      |  0
 .../utilities}/ip_operators.hpp                      |  0
 server/server_application.hpp                        |  5 +----
 server/server_methods.cpp                            | 12 ------------
 5 files changed, 3 insertions(+), 18 deletions(-)
 rename {client/client_utilities => common/utilities}/ip_operators.cpp (100%)
 rename {client/client_utilities => common/utilities}/ip_operators.hpp (100%)

diff --git a/client/gameplay_scenes/in_world_monsters.cpp b/client/gameplay_scenes/in_world_monsters.cpp
index 2e4179e..d0e3b2c 100644
--- a/client/gameplay_scenes/in_world_monsters.cpp
+++ b/client/gameplay_scenes/in_world_monsters.cpp
@@ -105,8 +105,8 @@ void InWorld::HandleMonsterMovement(MonsterPacket* const argPacket) {
 		return;
 	}
 
-	monsterIt.SetOrigin(argPacket->origin);
-	monsterIt.SetOrigin(argPacket->motion);
+	monsterIt->second.SetOrigin(argPacket->origin);
+	monsterIt->second.SetOrigin(argPacket->motion);
 }
 
 void InWorld::HandleMonsterAttack(MonsterPacket* const argPacket) {
diff --git a/client/client_utilities/ip_operators.cpp b/common/utilities/ip_operators.cpp
similarity index 100%
rename from client/client_utilities/ip_operators.cpp
rename to common/utilities/ip_operators.cpp
diff --git a/client/client_utilities/ip_operators.hpp b/common/utilities/ip_operators.hpp
similarity index 100%
rename from client/client_utilities/ip_operators.hpp
rename to common/utilities/ip_operators.hpp
diff --git a/server/server_application.hpp b/server/server_application.hpp
index 05a75a6..e9a0a41 100644
--- a/server/server_application.hpp
+++ b/server/server_application.hpp
@@ -34,6 +34,7 @@
 #include "udp_network_utility.hpp"
 
 //common utilities
+#include "ip_operators.hpp"
 #include "serial_packet.hpp"
 #include "singleton.hpp"
 
@@ -47,10 +48,6 @@
 #include <map>
 #include <string>
 
-//global utility functions
-bool operator==(IPaddress lhs, IPaddress rhs);
-bool operator!=(IPaddress lhs, IPaddress rhs);
-
 //The main application class
 class ServerApplication: public Singleton<ServerApplication> {
 public:
diff --git a/server/server_methods.cpp b/server/server_methods.cpp
index 1d50643..2bd79c0 100644
--- a/server/server_methods.cpp
+++ b/server/server_methods.cpp
@@ -25,18 +25,6 @@
 #include <iostream>
 #include <sstream>
 
-//-------------------------
-//these should've come standard
-//-------------------------
-
-bool operator==(IPaddress lhs, IPaddress rhs) {
-	return lhs.host == rhs.host && lhs.port == rhs.port;
-}
-
-bool operator!=(IPaddress lhs, IPaddress rhs) {
-	return !(lhs == rhs);
-}
-
 //-------------------------
 //server commands
 //-------------------------