summaryrefslogtreecommitdiff
path: root/src/bossBombDrop.cpp
diff options
context:
space:
mode:
authorColin Noga <Tempus@chronometry.ca>2012-07-11 02:34:29 -0500
committerColin Noga <Tempus@chronometry.ca>2012-07-11 02:34:29 -0500
commitc6461149389ec807371b9692b7484ab108e2a068 (patch)
tree5d2624e4d61ab5f4e8c1472fcb6733d612d4e071 /src/bossBombDrop.cpp
parentab412589662152c99c1653be980136912bcde4f3 (diff)
downloadkamek-c6461149389ec807371b9692b7484ab108e2a068.tar.gz
kamek-c6461149389ec807371b9692b7484ab108e2a068.zip
Plenty of bugfixes, and bowser improvements
Diffstat (limited to 'src/bossBombDrop.cpp')
-rw-r--r--src/bossBombDrop.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bossBombDrop.cpp b/src/bossBombDrop.cpp
index 0852501..c12d144 100644
--- a/src/bossBombDrop.cpp
+++ b/src/bossBombDrop.cpp
@@ -202,8 +202,8 @@ dBombDrop *dBombDrop::build() {
int dBombDrop::onCreate() {
int t = this->settings & 0xF;
- this->eventA = (this->settings >> 16) & 0xFF;
- this->eventB = (this->settings >> 24) & 0xFF;
+ this->eventA = ((this->settings >> 24) & 0xFF) - 1;
+ this->eventB = ((this->settings >> 16) & 0xFF) - 1;
if (t == 0) {
@@ -229,7 +229,7 @@ int dBombDrop::onExecute() {
bool active;
active = dFlagMgr_c::instance->active(eventA);
if (active) {
- create(WM_SMALLCLOUD, 0, &pos, &rot, 0);
+ create(WM_SMALLCLOUD, 0, &pos , &rot, 0);
dFlagMgr_c::instance->set(eventA, 0, false, false, false);
dFlagMgr_c::instance->set(eventA+1, 0, true, false, false);
}