Last change
on this file since 3605 was
3605,
checked in by bensch, 19 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:
338 bytes
|
Rev | Line | |
---|
[3310] | 1 | /*! |
---|
| 2 | \file helper_parent.h |
---|
| 3 | \brief this is a parent class, that isn't visible in the real world itself |
---|
| 4 | */ |
---|
| 5 | |
---|
| 6 | |
---|
| 7 | #ifndef _HELPER_PARENT_H |
---|
| 8 | #define _HELPER_PARENT_H |
---|
| 9 | |
---|
| 10 | #include "stdincl.h" |
---|
| 11 | #include "p_node.h" |
---|
| 12 | |
---|
| 13 | |
---|
| 14 | |
---|
| 15 | class HelperParent : public PNode { |
---|
| 16 | |
---|
| 17 | public: |
---|
| 18 | HelperParent (); |
---|
[3605] | 19 | virtual ~HelperParent (); |
---|
[3310] | 20 | |
---|
| 21 | }; |
---|
| 22 | |
---|
| 23 | #endif /* _HELPER_PARENT_H */ |
---|
Note: See
TracBrowser
for help on using the repository browser.