Changeset 2530 for code/branches/bugger/src/orxonox/objects/worldentities/pawns/Pawn.cc

Timestamp:

Dec 23, 2008, 10:40:38 PM (16 years ago)

Author:

rgrieder

Message:

merged revisions 2260 - 2508 from trunk to buggy.
I'm sorry that I have to commit every merge. But otherwise I get tons of conflicts I have to solve ten times over.
Note: did not merge deletion of src/util/testing, tortoise wasn't very friendly with that.

Location:

code/branches/bugger

Files:

• . (modified) (1 prop)
• src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) (1 diff)

code/branches/bugger/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -106 +106 @@
     void Pawn::tick(float dt)
     {
+        this->health_ -= dt * rnd() * 150;
+
         SUPER(Pawn, tick, dt);