Changeset 2112 for code/branches/objecthierarchy/src/orxonox/gamestates

Timestamp:

Nov 2, 2008, 12:54:17 PM (16 years ago)

Author:

rgrieder

Message:

Test: replacing namespace network with namespace orxonox. network::packet —> orxonox::packet

Location:

code/branches/objecthierarchy/src/orxonox/gamestates

Files:

• GSClient.cc (modified) (1 diff)
• GSClient.h (modified) (1 diff)
• GSDedicated.cc (modified) (1 diff)
• GSDedicated.h (modified) (1 diff)
• GSServer.cc (modified) (1 diff)
• GSServer.h (modified) (1 diff)

code/branches/objecthierarchy/src/orxonox/gamestates/GSClient.cc

@@ -53 +53 @@
         Core::setIsClient(true);
 
-        this->client_ = new network::Client(CommandLine::getValue("ip").getString(), CommandLine::getValue("port"));
+        this->client_ = new Client(CommandLine::getValue("ip").getString(), CommandLine::getValue("port"));
 
         if(!client_->establishConnection())

code/branches/objecthierarchy/src/orxonox/gamestates/GSClient.h

@@ -49 +49 @@
         void ticked(const Clock& time);
 
-        network::Client* client_;
+        Client* client_;
     };
 }

code/branches/objecthierarchy/src/orxonox/gamestates/GSDedicated.cc

@@ -50 +50 @@
         Core::setHasServer(true);
 
-        this->server_ = new network::Server(CommandLine::getValue("port"));
+        this->server_ = new Server(CommandLine::getValue("port"));
         COUT(0) << "Loading scene in server mode" << std::endl;
 

code/branches/objecthierarchy/src/orxonox/gamestates/GSDedicated.h

@@ -48 +48 @@
         void ticked(const Clock& time);
 
-        network::Server*      server_;
+        Server*      server_;
     };
 }

code/branches/objecthierarchy/src/orxonox/gamestates/GSServer.cc

@@ -52 +52 @@
         Core::setHasServer(true);
 
-        this->server_ = new network::Server(CommandLine::getValue("port"));
+        this->server_ = new Server(CommandLine::getValue("port"));
         COUT(0) << "Loading scene in server mode" << std::endl;
 

code/branches/objecthierarchy/src/orxonox/gamestates/GSServer.h

@@ -48 +48 @@
         void ticked(const Clock& time);
 
-        network::Server*      server_;
+        Server*      server_;
     };
 }