Changeset 6709 for code/trunk/src/orxonox/items/MultiStateEngine.cc
- Timestamp:
- Apr 13, 2010, 9:32:08 AM (14 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/ppspickups1 (added) merged: 6552,6574-6575,6579,6607,6643,6645-6648,6681,6694,6703,6705-6706
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/items/MultiStateEngine.cc
r6417 r6709 129 129 else 130 130 this->state_ = Idle; 131 132 if (this->state_ == Idle && this->getSpeedAdd() > 0) 133 this->state_ = Normal; 131 134 } 132 135
Note: See TracChangeset
for help on using the changeset viewer.