summaryrefslogtreecommitdiff
path: root/src/koopatlas/mapdata.h
diff options
context:
space:
mode:
authorColin Noga <Tempus@chronometry.ca>2012-07-18 21:16:24 -0500
committerColin Noga <Tempus@chronometry.ca>2012-07-18 21:16:24 -0500
commit8f1b1aa7eb7f8700e1979b5c4d1d4e96d274119b (patch)
tree5b5b60ec7b346758d4fb6e783a1315a8c3532481 /src/koopatlas/mapdata.h
parentd2f76bb1313364397135c93c37672e57b50fb0a2 (diff)
downloadkamek-8f1b1aa7eb7f8700e1979b5c4d1d4e96d274119b.tar.gz
kamek-8f1b1aa7eb7f8700e1979b5c4d1d4e96d274119b.zip
Updated doodad engine spec with delays, and a few other minor fixes
Diffstat (limited to 'src/koopatlas/mapdata.h')
-rw-r--r--src/koopatlas/mapdata.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/koopatlas/mapdata.h b/src/koopatlas/mapdata.h
index ace1edd..c4d16b5 100644
--- a/src/koopatlas/mapdata.h
+++ b/src/koopatlas/mapdata.h
@@ -28,6 +28,7 @@ struct dKPDoodad_s {
int frameCount;
AnimTypes type;
int start, end;
+ int delay, delayOffset;
u32 baseTick;
bool isReversed;
@@ -66,11 +67,10 @@ struct dKPNode_s {
NodeTypes type;
union {
- struct { u8 levelNumber[2]; };
+ struct { u8 levelNumber[2]; bool hasSecret; };
struct { const char *destMap; u8 thisID, foreignID, transition, _; };
};
-
dKPPath_s *getAnyExit() {
for (int i = 0; i < 4; i++)
if (exits[i])
@@ -79,6 +79,11 @@ struct dKPNode_s {
}
dKPPath_s *getOppositeExitTo(dKPPath_s *path);
+
+ mHeapAllocator_c allocator;
+ m3d::mdl_c model;
+ m3d::anmVis_c color;
+ mMtx matrix;
};
struct dKPPath_s {
@@ -201,6 +206,7 @@ class dKPMapData_c {
dKPLayer_s *pathLayer;
dDvdLoader_c bgLoader;
+ dDvdLoader_c nodeLoader;
dKPMapData_c();
bool load(const char *filename);