Changeset 9305 in orxonox.OLD

Timestamp:

Jul 17, 2006, 1:54:36 PM (18 years ago)

Author:

bensch

Message:

compiles again

Location:

branches/proxy/src

Files:

• lib/coord/p_node.h (modified) (1 diff)
• lib/util/ip.cc (modified) (2 diffs)
• lib/util/ip.h (modified) (2 diffs)
• world_entities/camera.cc (modified) (1 diff)

branches/proxy/src/lib/coord/p_node.h

@@ -73 +73 @@
 
 //! Patent Node is a Engine to calculate the position of an Object in respect to the position of its parent.
-class PNode : virtual public BaseObject, public Synchronizeable {
+class PNode : virtual public BaseObject, virtual public Synchronizeable {
  public:
   PNode (PNode* parent = PNode::getNullParent(), long nodeFlags = PNODE_PARENT_MODE_DEFAULT);

branches/proxy/src/lib/util/ip.cc

@@ -7 +7 @@
 
 #include "ip.h"
+#include "multi_type.h"
 
 IP::IP()
@@ -23 +24 @@
 
 
+
+
 int IP::stringToIP(const std::string& ip)
 {
 
-
 }
 
-const std::string& IP::ipToString(int ip)
+std::string IP::ipToString(const IPaddress& ipaddr)
 {
-  std::string ipaddr;
-
-  number = SDLNet_Read32 (&addr.host);
-  printf ("Host-Reihenfolge:     %d.%d.%d.%d\n",
-          (number & 0xFF000000)>>24, (number & 0x00FF0000)>>16,
-          (number & 0x0000FF00)>>8, (number & 0x000000FF));
+  int ip = SDLNet_Read32 (ipaddr.host);
+  return ipToString(ip);
 }
 
+
+std::string IP::ipToString(int ip)
+{
+  MultiType part0( (ip & 0xFF000000) >> 24);
+  MultiType part1( (ip & 0x00FF0000) >> 16);
+  MultiType part2( (ip & 0x0000FF00) >>  8);
+  MultiType part3( (ip & 0x000000FF) );
+
+
+  return part0.getString() + "." + part1.getString() + "." +
+           part2.getString() + "." + part3.getString();
+}
+

branches/proxy/src/lib/util/ip.h

@@ -24 +24 @@
 
 
-    float ip() const;
-    float ip(unsigned int part) const;
+    int ip() const { return this->_ip; };
+    short port() const { return this->_port; };
 
+    int ip(unsigned int part) const;
     std::string& ipString() const;
 
@@ -33 +34 @@
   public:
     static int stringToIP(const std::string& ip);
-    static const std::string& ipToString(int ip);
+    static std::string ipToString(const IPaddress& ipaddr);
+    static std::string ipToString(int ip);
 
   private:
     int           _ip;  //!< the IP in int form.
-
+    short         _port;
 
 };

branches/proxy/src/world_entities/camera.cc

@@ -17 +17 @@
 #include "camera.h"
 #include "key_mapper.h"
+#include "glincl.h"
 
 /**