Changeset 8147 in orxonox.OLD for trunk/src/world_entities/playable.cc

Timestamp:

Jun 5, 2006, 12:09:15 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network branche back here
merged with command:
svn merge -r8070:HEAD ​https://svn.orxonox.net/orxonox/branches/network .
no conflicts

File:

• trunk/src/world_entities/playable.cc (modified) (2 diffs)

trunk/src/world_entities/playable.cc

@@ -79 +79 @@
   // this->setPlayer(NULL);
   // IN ITS DESTRUCTOR.
+  
   assert(this->currentPlayer == NULL);
 }
@@ -281 +282 @@
  */
 void  Playable::detachCamera()
-{}
+{
+}