Changeset 5968 in orxonox.OLD for branches/network/src/world_entities/weapons/cannon.cc

Timestamp:

Dec 7, 2005, 4:16:51 PM (18 years ago)

Author:

patrick

Message:

network: merged the trunk into the network with the command svn merge -r5824:HEAD ../trunk network, changes changed… bla bla..

File:

• branches/network/src/world_entities/weapons/cannon.cc (modified) (2 diffs)

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

@@ -32 +32 @@
 #include "list.h"
 #include "animation3d.h"
-#include "sound_engine.h"
 
 #include "null_parent.h"
@@ -83 +82 @@
   this->setStateDuration(WS_DEACTIVATING, .4);
 
-  this->setMaximumEnergy(100, 1);
-  this->increaseEnergy(30);
+  this->setMaximumEnergy(100, 20);
+  this->increaseEnergy(100);
   //this->minCharge = 2;