Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5996 in orxonox.OLD for trunk/src/world_entities


Ignore:
Timestamp:
Dec 9, 2005, 12:31:01 PM (19 years ago)
Author:
patrick
Message:

orxonox/trunk: merged network branche into trunk with command svn merge -r 5824:HEAD

Location:
trunk/src/world_entities
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/world_entities/space_ships/space_ship.h

    r5978 r5996  
     1
    12/*!
    23 * @file space_ship.h
    … …  
    5758    bool                  bRollL;             //!< rolling button pressed (left)
    5859    bool                  bRollR;             //!< rolling button pressed (right)
    59    
     60
    6061    float                 xMouse;             //!< mouse moved in x-Direction
    6162    float                 yMouse;             //!< mouse moved in y-Direction

  • trunk/src/world_entities/world_entity.cc

    r5995 r5996  
    4141 */
    4242WorldEntity::WorldEntity(const TiXmlElement* root)
     43  : Synchronizeable()
    4344{
    4445  this->setClassID(CL_WORLD_ENTITY, "WorldEntity");

  • trunk/src/world_entities/world_entity.h

    r5995 r5996  
    88
    99#include "p_node.h"
     10#include "synchronizeable.h"
     11#include "model.h"
    1012
    1113#include "glincl.h"
    … …  
    2224
    2325//! Basis-class all interactive stuff in the world is derived from
    24 class WorldEntity : public PNode
     26class WorldEntity : public PNode, public Synchronizeable
    2527{
    2628 public:
Note: See TracChangeset for help on using the changeset viewer.