summaryrefslogtreecommitdiff
path: root/src/koopatlas
diff options
context:
space:
mode:
Diffstat (limited to 'src/koopatlas')
-rw-r--r--src/koopatlas/mapdata.cpp17
-rw-r--r--src/koopatlas/mapdata.h6
-rw-r--r--src/koopatlas/pathmanager.cpp4
3 files changed, 3 insertions, 24 deletions
diff --git a/src/koopatlas/mapdata.cpp b/src/koopatlas/mapdata.cpp
index dd4646b..650f1e3 100644
--- a/src/koopatlas/mapdata.cpp
+++ b/src/koopatlas/mapdata.cpp
@@ -226,23 +226,6 @@ void dKPMapData_c::fixup() {
}
- /*SaveBlock *save = GetSaveFile()->GetBlock(-1);
- for (int i = 0; i < pathLayer->pathCount; i++) {
- dKPPath_s *path = pathLayer->paths[i];
-
- if (path->unlockType > 0) {
- u32 conds = save->GetLevelCondition(path->unlockLevelNumber[0] - 1, path->unlockLevelNumber[1] - 1);
-
- if (path->unlockType == 1 && (conds & COND_NORMAL))
- path->isAvailable = true;
- else if (path->unlockType == 2 && (conds & COND_SECRET))
- path->isAvailable = true;
- else
- path->isAvailable = false;
- }
- }*/
-
-
// before we finish here, create the Node Extra classes
// first off, count how many we need...
diff --git a/src/koopatlas/mapdata.h b/src/koopatlas/mapdata.h
index b9a32f3..48a1720 100644
--- a/src/koopatlas/mapdata.h
+++ b/src/koopatlas/mapdata.h
@@ -75,8 +75,6 @@ struct dKPNode_s {
// The union is placed at the very end so we can leave out padding in the
// kpbin
union {
- // struct { u8 levelNumber[2]; };
- // FORWARDS COMPATIBILITY:
struct { u8 levelNumber[2]; bool hasSecret; };
struct { const char *destMap; u8 thisID, foreignID, transition, _; };
};
@@ -104,9 +102,9 @@ struct dKPPath_s {
dKPNode_s *start, *end;
dKPLayer_s *tileLayer, *doodadLayer;
- u8 unlockType; // 0 = always, 1 = normal, 2 = secret
- u8 unlockLevelNumber[2];
u8 isAvailable; // computed on-the-fly - default from Koopatlas is 1
+ u8 hasSecret;
+ u8 _padding[2];
float speed;
int animation;
};
diff --git a/src/koopatlas/pathmanager.cpp b/src/koopatlas/pathmanager.cpp
index 444684c..4eb6c2d 100644
--- a/src/koopatlas/pathmanager.cpp
+++ b/src/koopatlas/pathmanager.cpp
@@ -92,7 +92,7 @@ void dWMPathManager_c::unlockPaths() {
// begin processing a block
bool value = evaluateUnlockCondition(in, save);
- // , get what it's supposed to affect
+ // get what it's supposed to affect
// for now we'll assume that it affects one or more paths
u8 affectedCount = *(in++);
@@ -106,8 +106,6 @@ void dWMPathManager_c::unlockPaths() {
PathAvailabilityData[pathID] = dKPPath_s::AVAILABLE;
// NEWLY_AVAILABLE is set later, when that stuff is figured out
}
-
- // now evaluate a condition. simple!
}
// did anything become newly available?!