Changeset 11773
- Timestamp:
- Feb 18, 2018, 6:21:10 PM (7 years ago)
- Location:
- code/branches/Presentation_HS17_merge/src/modules/superorxobros
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc
r11772 r11773 169 169 //The time on the HUD 170 170 if (!done_) 171 timeLeft_-=dt*2.5 ;171 timeLeft_-=dt*2.5f; 172 172 } 173 173 -
code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.h
r11769 r11773 83 83 } 84 84 int getTimeLeft() { 85 return timeLeft_;85 return (int) timeLeft_; 86 86 } 87 87 std::string getInfoText() { -
code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc
r11772 r11773 180 180 velocity.x = dir*speed_; 181 181 velocity.y = 0; 182 if(hitCounter_ >= 3) velocity.y = 0.1 *speed_;182 if(hitCounter_ >= 3) velocity.y = 0.1f*speed_; 183 183 setVelocity(velocity); 184 184 -
code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBQBlock.cc
r11766 r11773 64 64 //If you hit the QBlock, the visibility of all attached objects get inverted! Pretty easy way to create changing blocks :) 65 65 float v_z = otherObject->getVelocity().z; 66 int collDisZ_ = getPosition().z - contactPoint.getPositionWorldOnB().getZ();66 float collDisZ_ = getPosition().z - contactPoint.getPositionWorldOnB().getZ(); 67 67 if (!used_ && v_z > 50.0 && collDisZ_ > 0) { 68 68 used_ = true;
Note: See TracChangeset
for help on using the changeset viewer.