diff options
| author | Treeki <treeki@gmail.com> | 2012-09-27 16:58:43 +0200 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2012-09-27 16:58:43 +0200 |
| commit | 624a89dc12d88973486b39937871c5facf6b9bb6 (patch) | |
| tree | ff7614e780d13162d1749e4f57478dc16b9226d7 /src/koopatlas/mapdata.h | |
| parent | 3268b1fab87a34897289faa8a1f5ee0679f74e19 (diff) | |
| parent | 0fc70778c02671e64b8360b7ebdbb0e8c29f0a05 (diff) | |
| download | kamek-624a89dc12d88973486b39937871c5facf6b9bb6.tar.gz kamek-624a89dc12d88973486b39937871c5facf6b9bb6.zip | |
Merge branch 'new-hud' into level-select
Diffstat (limited to 'src/koopatlas/mapdata.h')
| -rw-r--r-- | src/koopatlas/mapdata.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/koopatlas/mapdata.h b/src/koopatlas/mapdata.h index bc0c599..f7194ef 100644 --- a/src/koopatlas/mapdata.h +++ b/src/koopatlas/mapdata.h @@ -53,7 +53,7 @@ struct dKPPath_s; struct dKPNode_s { enum NodeTypes { - PASS_THROUGH, STOP, LEVEL, CHANGE + PASS_THROUGH, STOP, LEVEL, CHANGE, WORLD_CHANGE }; short x, y; @@ -79,6 +79,7 @@ struct dKPNode_s { union { struct { u8 levelNumber[2]; bool hasSecret; }; struct { const char *destMap; u8 thisID, foreignID, transition, _; }; + struct { u8 worldID, __[3]; }; }; dKPPath_s *getAnyExit() { @@ -187,6 +188,15 @@ struct dKPLayer_s { int findNodeID(dKPNode_s *node); }; +struct dKPWorldDef_s { + const char *name; + GXColor fsTextColours[2]; + GXColor fsHintColours[2]; + GXColor hudTextColours[2]; + s16 hudHintH, hudHintS, hudHintL; + u8 key, trackID; +}; + struct dKPMapFile_s { u32 magic; int version; @@ -202,6 +212,9 @@ struct dKPMapFile_s { dKPLayer_s::sector_s *sectors; const char *backgroundName; + + dKPWorldDef_s *worlds; + int worldCount; }; class dKPMapData_c { @@ -253,6 +266,8 @@ class dKPMapData_c { dKPNodeExtra_c *levelNodeExtraArray; + const dKPWorldDef_s *findWorldDef(int id) const; + dKPMapData_c(); bool load(const char *filename); ~dKPMapData_c(); |