Changeset 6749 in orxonox.OLD

Timestamp:

Jan 26, 2006, 12:23:06 AM (18 years ago)

Author:

patrick

Message:

network: weapon manager enabled again

Location:

branches/network/src

Files:

• lib/network/handshake.cc (modified) (1 diff)
• world_entities/weapons/weapon_manager.cc (modified) (1 diff)

branches/network/src/lib/network/handshake.cc

@@ -21 +21 @@
 
 #include "handshake.h"
+
+#include "assert.h"
 
 Handshake::Handshake( bool server, int clientId, int networkGameManagerId )

branches/network/src/world_entities/weapons/weapon_manager.cc

@@ -217 +217 @@
 bool WeaponManager::addWeapon(Weapon* weapon, int configID, int slotID)
 {
-  //if ( weapon == NULL )
+  if ( weapon == NULL )
     return false;