Changeset 7255 in orxonox.OLD for branches/preferences/src/orxonox.cc

Timestamp:

Mar 30, 2006, 11:11:16 AM (19 years ago)

Author:

rennerc

Message:

one char* removed

File:

• branches/preferences/src/orxonox.cc (modified) (6 diffs)

branches/preferences/src/orxonox.cc

@@ -89 +89 @@
 
   /* this way, there is no network enabled: */
-  this->serverName = NULL;
+  this->serverName = "";
   this->port = -1;
 
@@ -185 +185 @@
  * initialize Orxonox with command line
  */
-int Orxonox::init (int argc, char** argv, const char* name, int port)
+int Orxonox::init (int argc, char** argv, const std::string & name, int port)
 {
   this->argc = argc;
@@ -277 +277 @@
   PRINT(3)("> Initializing networking\n");
 
-  if( this->serverName != NULL) // we are a client
+  if( this->serverName != "") // we are a client
   {
     State::setOnline(true);
@@ -424 +424 @@
     return startNetworkOrxonox(argc, argv);
   
-  return startOrxonox(argc, argv, NULL, -1);
+  return startOrxonox(argc, argv, "", -1);
   return 0;
 }
@@ -461 +461 @@
     printf("Starting Orxonox as server: listening on port %i\n", port);
     
-    startOrxonox(argc, argv, NULL, port);
+    startOrxonox(argc, argv, "", port);
   }
 }
@@ -472 +472 @@
  * @param argv parameters given to orxonox
  */
-int startOrxonox(int argc, char** argv, const char* name, int port)
+int startOrxonox(int argc, char** argv, const std::string & name, int port)
 {
   // checking for existence of the configuration-files, or if the lock file is still used