Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8941 in orxonox.OLD for branches/single_player_map/src


Ignore:
Timestamp:
Jun 30, 2006, 2:55:49 AM (18 years ago)
Author:
patrick
Message:

isOnGround bug found and repair station workd

Location:
branches/single_player_map/src/world_entities
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/single_player_map/src/world_entities/npcs/repair_station.cc

    r8931 r8941  
    120120
    121121
     122
     123
     124
     125void RepairStation::activate()
     126{}
     127
     128void RepairStation::deactivate()
     129{}
     130
     131void RepairStation::toggleRotation()
     132{}
     133
     134
    122135/**
    123136 * ticks the door
     
    129142    ((InteractiveModel*)this->getModel(0))->tick(time);
    130143
    131   if( !this->bOpen)
    132   {
    133     if( this->checkOpen())
    134     {
    135       this->open();
    136     }
    137   }
    138   else
    139   {
    140     if( !this->checkOpen())
    141     {
    142       this->close();
    143     }
    144   }
    145144
    146145}
  • branches/single_player_map/src/world_entities/npcs/repair_station.h

    r8931 r8941  
    2121  REPAIR_CYCLE08,
    2222
    23   DOOR_MAX_ANIMATIONS
     23  REPAIR_MAX_ANIMATIONS
    2424};
    2525
     
    3737    void setScale(float scale) { this->scale = scale; }
    3838
     39    void activate();
     40    void deactivate();
     41    void toggleRotation();
     42
    3943    virtual void tick (float time);
    4044
     
    4953    static sAnim   animationList[8];  //!< list of the animations
    5054
     55    int            animationCurrent;  //!< number of the current animation
     56    int            animationStep;     //!< the incrementation step of the animation
    5157
    5258};
  • branches/single_player_map/src/world_entities/world_entity.cc

    r8940 r8941  
    7676
    7777  this->objectListNumber = OM_INIT;
     78  this->lastObjectListNumber = OM_INIT;
    7879  this->objectListIterator = NULL;
    7980
  • branches/single_player_map/src/world_entities/world_entity.h

    r8939 r8941  
    9595
    9696  /** @returns true if this entity is standing on ground (BSP model) */
    97   bool isOnGround() const { return this->isOnGround(); }
     97  bool isOnGround() const { return this->bOnGround; }
    9898  /** @param flag: marks if this entity is standing on ground */
    9999  void setOnGround(bool flag) { this->bOnGround = flag; }
Note: See TracChangeset for help on using the changeset viewer.