Last change
on this file since 4225 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:
549 bytes
|
Rev | Line | |
---|
[3522] | 1 | /*! |
---|
| 2 | \file track_node.h |
---|
| 3 | \brief Definition of the TrackNode are located here |
---|
| 4 | |
---|
| 5 | the TrackNode is the node, that follows the Track (and the TrackManager) |
---|
| 6 | through the level. |
---|
| 7 | Under normal confitions the Plyaer(s) are |
---|
| 8 | */ |
---|
| 9 | |
---|
| 10 | |
---|
| 11 | #ifndef _TRACK_NODE_H |
---|
| 12 | #define _TRACK_NODE_H |
---|
| 13 | |
---|
| 14 | #include "p_node.h" |
---|
| 15 | |
---|
| 16 | /* FORWARD DEFINITION */ |
---|
| 17 | class TrackManager; |
---|
| 18 | |
---|
| 19 | class TrackNode : public PNode { |
---|
| 20 | |
---|
| 21 | public: |
---|
[3556] | 22 | TrackNode (); |
---|
| 23 | TrackNode (Vector* absCoordinate); |
---|
| 24 | |
---|
[3533] | 25 | virtual ~TrackNode (); |
---|
[3522] | 26 | |
---|
| 27 | private: |
---|
| 28 | TrackManager* trackManager; |
---|
| 29 | |
---|
| 30 | }; |
---|
| 31 | |
---|
| 32 | #endif /* _TRACK_NODE_H */ |
---|
Note: See
TracBrowser
for help on using the repository browser.