Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: orxonox.OLD/orxonox/branches/levelloader/src/world_entities/environment.h @ 3770

Last change on this file since 3770 was 3605, checked in by bensch, 20 years ago

orxonox/trunk: merged trunk back to levelloader
merged with command:
svn merge -r 3499:HEAD trunk branches/levelloader

Conflicts in
C track_manager.h
C world_entities/player.cc
C world_entities/player.h
C world_entities/environment.h
C lib/coord/p_node.cc
C defs/debug.h
C track_manager.cc
C story_entities/campaign.h

solved in merge-favouring. It was quite easy because Chris only worked on the headers, and he didi it quite clean. Thats the spirit :)

Conflits in world.cc are a MESS: fix it
File size: 497 bytes
Line 
1#ifndef _ENVIRONEMENT_H
2#define _ENVIRONEMENT_H
3
4#include "world_entity.h"
5
6
7class Environment : public WorldEntity
8{
9  friend class World;
10
11 public:
12  Environment ();
13  Environment (TiXmlElement* root);
14  virtual ~Environment ();
15 
16  virtual void tick (float time);
17  virtual void hit (WorldEntity* weapon, Vector* loc);
18  virtual void destroy ();
19  virtual void collide (WorldEntity* other,  Uint32 ownhitflags, Uint32 otherhitflags);
20  virtual void draw ();
21
22};
23
24#endif /* _ENVIRONEMENT_H */
Note: See TracBrowser for help on using the repository browser.