summaryrefslogtreecommitdiff
path: root/src/koopatlas/pathmanager.h
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2012-09-24 05:40:39 +0200
committerTreeki <treeki@gmail.com>2012-09-24 05:40:39 +0200
commit245bb3325f613f81973866100e86ee681b0fde9d (patch)
tree7837866a91fc6c422ffb9b730c2fdbbb6577ea53 /src/koopatlas/pathmanager.h
parentaafa2a57c88c01067266244eae2a906d8771c065 (diff)
parent4f567256d015cf7a835ac03b9e5abb8a2a7eb12a (diff)
downloadkamek-245bb3325f613f81973866100e86ee681b0fde9d.tar.gz
kamek-245bb3325f613f81973866100e86ee681b0fde9d.zip
Merge branch 'level-select' into new-hud
Diffstat (limited to 'src/koopatlas/pathmanager.h')
-rw-r--r--src/koopatlas/pathmanager.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/koopatlas/pathmanager.h b/src/koopatlas/pathmanager.h
index cae96ba..5579f66 100644
--- a/src/koopatlas/pathmanager.h
+++ b/src/koopatlas/pathmanager.h
@@ -1,6 +1,13 @@
#ifndef __KOOPATLAS_PATH_MANAGER_H
#define __KOOPATLAS_PATH_MANAGER_H
+//#define WM_UNLOCK_DEBUGGING
+#ifdef WM_UNLOCK_DEBUGGING
+#define UnlockCmdReport OSReport
+#else
+#define UnlockCmdReport(...)
+#endif
+
#include "koopatlas/mapdata.h"
extern "C" void *SoundRelatedClass;
@@ -35,6 +42,9 @@ class dWMPathManager_c {
bool isJumping;
float moveSpeed;
+ int scaleAnimProgress;
+ bool isScalingUp;
+
dKPPath_s *currentPath;
bool reverseThroughPath; // direction we are going through the path
@@ -45,6 +55,7 @@ class dWMPathManager_c {
int unlockingAlpha; // -1 if not used
int countdownToFadeIn;
+ int waitAfterUnlock;
private:
void unlockPaths();
@@ -53,6 +64,8 @@ class dWMPathManager_c {
bool isEnteringLevel;
bool calledEnteredNode;
+ int levelStartWait;
+ dLevelInfo_c::entry_s *enteredLevel;
};
#endif