Changeset 6682 in orxonox.OLD

Timestamp:

Jan 24, 2006, 11:15:46 PM (18 years ago)

Author:

patrick

Message:

network: less parenting algoritmics

Location:

branches/network/src

Files:

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

branches/network/src/lib/coord/p_node.cc

@@ -1052 +1052 @@
   SYNCHELP_READ_FKT( BaseObject::writeState );
 
-  char * parentName = NULL;
-  SYNCHELP_READ_STRINGM( parentName );
-
-  if ( strcmp(parentName, "")==0 )
-  {
-    setParent( (char*)NULL );
-  }
-  else
-  {
-    setParent( parentName );
-  }
-
-  delete[] parentName;
+//   char * parentName = NULL;
+//   SYNCHELP_READ_STRINGM( parentName );
+//
+//   if ( strcmp(parentName, "")==0 )
+//   {
+//     setParent( (char*)NULL );
+//   }
+//   else
+//   {
+//     setParent( parentName );
+//   }
+//
+//  delete[] parentName;
 
   int parentMode;
@@ -1115 +1115 @@
   SYNCHELP_WRITE_FKT( BaseObject::readState );
 
-  if ( this->parent )
-  {
-    SYNCHELP_WRITE_STRING( parent->getName() );
-  }
-  else
-  {
-    SYNCHELP_WRITE_STRING( "" );
-  }
+//   if ( this->parent )
+//   {
+//     SYNCHELP_WRITE_STRING( parent->getName() );
+//   }
+//   else
+//   {
+//     SYNCHELP_WRITE_STRING( "" );
+//   }
 
   SYNCHELP_WRITE_INT( this->parentMode );

branches/network/src/util/state.cc

@@ -41 +41 @@
 Player* State::player = NULL;
 
+bool State::bOnline = false;
 
 /**

branches/network/src/util/state.h

@@ -73 +73 @@
 
 
+  ///////////////
+  /// NETWORK ///
+  ///////////////
+  /** sets the online stat (multiplayer network) @param bOnline is true if node is online */
+  static inline void setOnline(bool bOnline) { State::bOnline = bOnline; }
+  /** @returns true if this node is online (multiplayer network game) */
+  static bool isOnline() { return State::bOnline; }
+
 
  private:
@@ -87 +95 @@
   static unsigned int           resX;              //!< The X Resolution of the screen.
   static unsigned int           resY;              //!< The Y Resolution of the screen.
+
+  static bool                   bOnline;           //!< Is true if this node is in multiplayer mode (via network)
+
   };