diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-09-27 22:59:41 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-09-27 22:59:41 -0500 |
| commit | 64f38f642113ac4bd5b1d96e76c9ae97965bc416 (patch) | |
| tree | 99d9bbf4d577ae2d8a79fcb5f7101df1b57398fe /src/levelinfo.h | |
| parent | f9afbf1109b30bbc6011e81109b7e11961a4361a (diff) | |
| parent | b3c37e5a9ef81250d6554fcbb8089154b4940c9f (diff) | |
| download | kamek-64f38f642113ac4bd5b1d96e76c9ae97965bc416.tar.gz kamek-64f38f642113ac4bd5b1d96e76c9ae97965bc416.zip | |
Merge branch 'level-select' of ssh://treeki.rustedlogic.net:30000/Kamek into level-select
Diffstat (limited to 'src/levelinfo.h')
| -rw-r--r-- | src/levelinfo.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/levelinfo.h b/src/levelinfo.h index 470992b..20628d9 100644 --- a/src/levelinfo.h +++ b/src/levelinfo.h @@ -16,10 +16,10 @@ public: };
struct entry_s {
- u8 world;
- u8 level;
- u8 reserved1;
- u8 reserved2;
+ u8 worldSlot;
+ u8 levelSlot;
+ u8 displayWorld;
+ u8 displayLevel;
u8 nameLength;
u8 reserved3;
u16 flags;
@@ -32,7 +32,7 @@ private: public:
void load(void *buffer);
- entry_s *search(int world, int level);
+ entry_s *searchBySlot(int world, int level);
u32 sectionCount() {
return data->sectionCount;
|