summaryrefslogtreecommitdiff
path: root/src/bossBombDrop.cpp
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2013-05-05 00:47:46 +0200
committerTreeki <treeki@gmail.com>2013-05-05 00:47:46 +0200
commitc6f0395e90137424d8ce77d7fa0ac6c8ede991b3 (patch)
treeaef18ede5d2ddf0f5ef53eed7bcb8417714c5730 /src/bossBombDrop.cpp
parentb145133b5e21ce53001f5f5228380aef28ac4922 (diff)
downloadkamek-c6f0395e90137424d8ce77d7fa0ac6c8ede991b3.tar.gz
kamek-c6f0395e90137424d8ce77d7fa0ac6c8ede991b3.zip
final boss phase 1 potential fixes
Diffstat (limited to '')
-rw-r--r--src/bossBombDrop.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bossBombDrop.cpp b/src/bossBombDrop.cpp
index f617cdf..67564aa 100644
--- a/src/bossBombDrop.cpp
+++ b/src/bossBombDrop.cpp
@@ -153,6 +153,7 @@ int dDroppedBomb::onExecute() {
int ret = this->outOfZone(this->pos, (float*)&rect, this->currentZoneID);
if(ret) {
this->Delete(1);
+ dFlagMgr_c::instance->set(settings & 0xFF, 0, true, false, false);
}
speed.y = speed.y - 0.01875;
@@ -166,6 +167,7 @@ int dDroppedBomb::onExecute() {
if (collMgr.isOnTopOfTile() || (collMgr.outputMaybe & (0x15 << direction))) {
this->kill();
+ dFlagMgr_c::instance->set(settings & 0xFF, 0, true, false, false);
}
return true;
@@ -234,18 +236,16 @@ int dBombDrop::onExecute() {
bool active;
active = dFlagMgr_c::instance->active(eventA);
if (active) {
- create(WM_SMALLCLOUD, 0, &pos , &rot, 0);
+ create(WM_SMALLCLOUD, eventA+1, &pos , &rot, 0);
HackyBombDropVariable = true;
dFlagMgr_c::instance->set(eventA, 0, false, false, false);
- dFlagMgr_c::instance->set(eventA+1, 0, true, false, false);
}
active = dFlagMgr_c::instance->active(eventB);
if (active) {
- create(WM_SMALLCLOUD, 0, &pos, &rot, 0);
+ create(WM_SMALLCLOUD, eventB+1, &pos, &rot, 0);
HackyBombDropVariable = true;
dFlagMgr_c::instance->set(eventB, 0, false, false, false);
- dFlagMgr_c::instance->set(eventB+1, 0, true, false, false);
}
return true;