diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-08-29 13:22:45 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-08-29 13:22:45 -0500 |
| commit | 642c99cff7810bc979ade719d4b88e2941fa1461 (patch) | |
| tree | 57588855c9b8e8c63868e15ee75ce6796b9b664e | |
| parent | 8cedd9bfb7d35544c37f15f3f07357e0cc37c173 (diff) | |
| download | kamek-642c99cff7810bc979ade719d4b88e2941fa1461.tar.gz kamek-642c99cff7810bc979ade719d4b88e2941fa1461.zip | |
Node fix, added a new effect
| -rw-r--r-- | NewerProjectKP.yaml | 2 | ||||
| -rw-r--r-- | src/effectvideo.cpp | 1 | ||||
| -rw-r--r-- | src/koopatlas/mapdata.cpp | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/NewerProjectKP.yaml b/NewerProjectKP.yaml index 92264c1..f099f40 100644 --- a/NewerProjectKP.yaml +++ b/NewerProjectKP.yaml @@ -14,7 +14,7 @@ modules: - processed/spritetex.yaml # - processed/gakenoko.yaml - processed/poweruphax.yaml -# - processed/heapbar.yaml + # - processed/heapbar.yaml - processed/randtiles.yaml - processed/objkinoko.yaml - processed/tilegod.yaml diff --git a/src/effectvideo.cpp b/src/effectvideo.cpp index cea96fb..d690263 100644 --- a/src/effectvideo.cpp +++ b/src/effectvideo.cpp @@ -83,6 +83,7 @@ int EffectVideo::onExecute() { case 5: efName = "Wm_en_sndlandsmk"; break; case 6: efName = "Wm_en_sndlandsmk_s"; break; case 43: efName = "Wm_ob_cmnspark"; break; + case 159: efName = "Wm_mr_hardhit_grain"; break; case 177: efName = "Wm_ob_greencoinkira_b"; break; case 193: efName = "Wm_mr_electricshock_biri01_s"; break; case 216: efName = "Wm_en_blockcloud"; break; diff --git a/src/koopatlas/mapdata.cpp b/src/koopatlas/mapdata.cpp index ef0a747..1857b18 100644 --- a/src/koopatlas/mapdata.cpp +++ b/src/koopatlas/mapdata.cpp @@ -77,14 +77,14 @@ void dKPNode_s::setupNodeExtra() { // Is it complete? else if ((exitComplete) || (secretComplete)) { // Does it have two exits? - if ((this->hasSecret) && (!exitComplete) && (!secretComplete)) + if ((this->hasSecret) && (exitComplete) && (secretComplete)) colour = "g3d/blue.brres"; // Does it have one exit? else if ((!this->hasSecret) && (exitComplete)) colour = "g3d/blue.brres"; - // All exits are complete + // Not all exits are complete else colour = "g3d/purple.brres"; } |