- Timestamp:
- Jun 21, 2006, 10:13:44 PM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/bsp_model/src/world_entities/creatures/fps_player.cc
r8686 r8687 23 23 24 24 #include "key_mapper.h" 25 26 #include "debug.h" 25 27 26 28 … … 84 86 registerEvent(KeyMapper::PEV_RIGHT); 85 87 registerEvent(KeyMapper::PEV_FIRE1); 88 registerEvent(KeyMapper::PEV_JUMP); 86 89 registerEvent(EV_MOUSE_MOTION); 87 90 … … 101 104 102 105 // collision reaction registration 103 this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, CL_BSP_ENTITY);106 //this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, CL_BSP_ENTITY); 104 107 } 105 108 … … 157 160 Playable::tick( time ); 158 161 159 if( ( xMouse != 0 || yMouse != 0 ) && this->getOwner() == this->getHostID())160 { 161 xMouse *= time / 10;162 yMouse *= time / 10;162 if( ( xMouse != 0 || yMouse != 0 ) && /*this->getOwner() == this->getHostID()*/ true) 163 { 164 xMouse *= time ; 165 yMouse *= time ; 163 166 164 167 angleX -= xMouse; … … 207 210 208 211 209 if( likely(this->getModel(0) != NULL) && this->getModel(0)->isA(CL_INTERACTIVE_MODEL))210 {211 ((InteractiveModel*)this->getModel(0))->tick(time);212 213 // handle animations differently214 if( this->bJump && likely(this->getModel(0) != NULL))215 {216 ((InteractiveModel*)this->getModel(0))->setAnimation(JUMP);217 }212 // if( likely(this->getModel(0) != NULL) && this->getModel(0)->isA(CL_INTERACTIVE_MODEL)) 213 // { 214 // ((InteractiveModel*)this->getModel(0))->tick(time); 215 // 216 // // handle animations differently 217 // if( this->bJump && likely(this->getModel(0) != NULL)) 218 // { 219 // ((InteractiveModel*)this->getModel(0))->setAnimation(JUMP); 220 // } 218 221 // else if( this->bFire && likely(this->getModel(0) != NULL)) 219 222 // { … … 226 229 // ((InteractiveModel*)this->getModel(0))->setAnimation(RUN); 227 230 // } 228 else if (likely(this->getModel(0) != NULL))229 {230 if( ((InteractiveModel*)this->getModel(0))->getAnimation() != STAND)231 ((InteractiveModel*)this->getModel(0))->setAnimation(STAND);232 }233 }231 // else if (likely(this->getModel(0) != NULL)) 232 // { 233 // if( ((InteractiveModel*)this->getModel(0))->getAnimation() != STAND) 234 // ((InteractiveModel*)this->getModel(0))->setAnimation(STAND); 235 // } 236 // } 234 237 235 238 }
Note: See TracChangeset
for help on using the changeset viewer.