Last change
on this file since 3715 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:
823 bytes
|
Line | |
---|
1 | |
---|
2 | #ifndef _CAMPAIGN_HCREATE_FACTORY |
---|
3 | #define _CAMPAIGN_H |
---|
4 | |
---|
5 | #include "stdincl.h" |
---|
6 | #include "story_entity.h" |
---|
7 | |
---|
8 | |
---|
9 | class World; |
---|
10 | |
---|
11 | class Campaign : public StoryEntity { |
---|
12 | |
---|
13 | public: |
---|
14 | Campaign (); |
---|
15 | Campaign ( TiXmlElement* root); |
---|
16 | virtual ~Campaign (); |
---|
17 | |
---|
18 | StoryEntity* currentEntity; |
---|
19 | |
---|
20 | virtual ErrorMessage init(); |
---|
21 | virtual ErrorMessage start(int storyID = 0); |
---|
22 | virtual ErrorMessage pause(); |
---|
23 | virtual ErrorMessage resume(); |
---|
24 | virtual ErrorMessage stop(); |
---|
25 | virtual ErrorMessage destroy(); |
---|
26 | |
---|
27 | void addEntity(StoryEntity* se, int storyID); |
---|
28 | void addEntity(StoryEntity* se); |
---|
29 | void removeEntity(int storyID); |
---|
30 | void removeEntity(StoryEntity* se); |
---|
31 | |
---|
32 | void nextLevel(); |
---|
33 | void previousLevel(); |
---|
34 | |
---|
35 | private: |
---|
36 | ListTemplate<StoryEntity>* entities; |
---|
37 | bool running; |
---|
38 | |
---|
39 | StoryEntity* getStoryEntity(int storyID); |
---|
40 | }; |
---|
41 | |
---|
42 | #endif /* _CAMPAIGN_H */ |
---|
Note: See
TracBrowser
for help on using the repository browser.