summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2013-02-12 02:18:15 +0100
committerTreeki <treeki@gmail.com>2013-02-12 02:18:15 +0100
commit10a3cd4df5e3b57b2e29cdc7ffa8bba611885625 (patch)
tree363a8a043f63d089156d0d3f7e16e4b70012b084
parent25c7c042247619006dd6b6c6c12cf08502e0829b (diff)
downloadkamek-10a3cd4df5e3b57b2e29cdc7ffa8bba611885625.tar.gz
kamek-10a3cd4df5e3b57b2e29cdc7ffa8bba611885625.zip
couple of edits to the generic boss stuff
-rw-r--r--src/boss.cpp6
-rw-r--r--src/boss.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/boss.cpp b/src/boss.cpp
index bf5e4c1..22553ff 100644
--- a/src/boss.cpp
+++ b/src/boss.cpp
@@ -100,13 +100,13 @@ void OutroSetup(daBoss *actor) {
WLClass::instance->_4 = 5;
WLClass::instance->_8 = 0;
dStage32C_c::instance->freezeMarioBossFlag = 1;
-}
-
-bool ShrinkBoss(daBoss *actor, Vec *pos, float scale, int timer) {
nw4r::snd::SoundHandle handle;
PlaySoundWithFunctionB4(SoundRelatedClass, &handle, SE_BOSS_CMN_DAMAGE_LAST, 1);
+}
+
+bool ShrinkBoss(daBoss *actor, Vec *pos, float scale, int timer) {
// Adjust actor to equal the scale of your boss / 80.
actor->scale.x -= scale / 80.0;
actor->scale.y -= scale / 80.0;
diff --git a/src/boss.h b/src/boss.h
index 57ef494..6bdcf61 100644
--- a/src/boss.h
+++ b/src/boss.h
@@ -25,7 +25,7 @@ class daBoss : public dEn_c {
public:
u32 timer;
char dying;
- u32 damage;
+ int damage;
daKameckDemo *Kameck;
};