From 10a3cd4df5e3b57b2e29cdc7ffa8bba611885625 Mon Sep 17 00:00:00 2001 From: Treeki Date: Tue, 12 Feb 2013 02:18:15 +0100 Subject: couple of edits to the generic boss stuff --- src/boss.cpp | 6 +++--- src/boss.h | 2 +- 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; }; -- cgit v1.2.3