Moved ip_operators.*pp to common/utilities

This commit is contained in:
Kayne Ruse
2015-02-05 23:06:22 +11:00
parent 95e3ce9a69
commit bad6cc2fab
5 changed files with 3 additions and 18 deletions
+2 -2
View File
@@ -105,8 +105,8 @@ void InWorld::HandleMonsterMovement(MonsterPacket* const argPacket) {
return; return;
} }
monsterIt.SetOrigin(argPacket->origin); monsterIt->second.SetOrigin(argPacket->origin);
monsterIt.SetOrigin(argPacket->motion); monsterIt->second.SetOrigin(argPacket->motion);
} }
void InWorld::HandleMonsterAttack(MonsterPacket* const argPacket) { void InWorld::HandleMonsterAttack(MonsterPacket* const argPacket) {
+1 -4
View File
@@ -34,6 +34,7 @@
#include "udp_network_utility.hpp" #include "udp_network_utility.hpp"
//common utilities //common utilities
#include "ip_operators.hpp"
#include "serial_packet.hpp" #include "serial_packet.hpp"
#include "singleton.hpp" #include "singleton.hpp"
@@ -47,10 +48,6 @@
#include <map> #include <map>
#include <string> #include <string>
//global utility functions
bool operator==(IPaddress lhs, IPaddress rhs);
bool operator!=(IPaddress lhs, IPaddress rhs);
//The main application class //The main application class
class ServerApplication: public Singleton<ServerApplication> { class ServerApplication: public Singleton<ServerApplication> {
public: public:
-12
View File
@@ -25,18 +25,6 @@
#include <iostream> #include <iostream>
#include <sstream> #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 //server commands
//------------------------- //-------------------------