rename the param of powBlockActivated() from isMPGP to isNotMPGP

8 files changed, 16 insertions, 16 deletions

diff --git a/include/game.h b/include/game.h
index 2184920..9d126a9 100755
--- a/include/game.h
+++ b/include/game.h
@@ -2549,7 +2549,7 @@ public:
 	virtual bool collisionCat14_YoshiFire(ActivePhysics *apThis, ActivePhysics *apOther);

 

 	virtual void _vf140(dStageActor_c *actor);

-	virtual void powBlockActivated(bool isMPGP);

+	virtual void powBlockActivated(bool isNotMPGP);

 	virtual void _vf148(); // deletes actors held by Class484 and other stuff

 	virtual void _vf14C(); // deletes actors held by Class484 and makes an En Coin Jump

 	virtual u32 canBePowed(); // reads some bits from a value in Class1EC

diff --git a/src/bossMegaGoomba.cpp b/src/bossMegaGoomba.cpp
index 22a4799..6f0ad15 100644
--- a/src/bossMegaGoomba.cpp
+++ b/src/bossMegaGoomba.cpp
@@ -93,7 +93,7 @@ class daMegaGoomba_c : public dEn_c {
 	bool _vf110(ActivePhysics *apThis, ActivePhysics *apOther);
 	bool _vf108(ActivePhysics *apThis, ActivePhysics *apOther);
 
-	void powBlockActivated(bool isMPGP);
+	void powBlockActivated(bool isNotMPGP);
 
 	void dieOther_Begin();
 	void dieOther_Execute();
@@ -183,7 +183,7 @@ extern "C" int SomeStrangeModification(dStageActor_c* actor);
 extern "C" void DoStuffAndMarkDead(dStageActor_c *actor, Vec vector, float unk);
 extern "C" int SmoothRotation(short* rot, u16 amt, int unk2);
 
-void daMegaGoomba_c::powBlockActivated(bool isMPGP) {
+void daMegaGoomba_c::powBlockActivated(bool isNotMPGP) {
 }
 
 CREATE_STATE(daMegaGoomba_c, Shrink);
diff --git a/src/bossSamurshai.cpp b/src/bossSamurshai.cpp
index b608916..fbf079b 100644
--- a/src/bossSamurshai.cpp
+++ b/src/bossSamurshai.cpp
@@ -50,7 +50,7 @@ class daSamurshai : public daBoss {
 	void updateModelMatrices();
 	bool calculateTileCollisions();
 
-	void powBlockActivated(bool isMPGP);
+	void powBlockActivated(bool isNotMPGP);
 
 	void playerCollision(ActivePhysics *apThis, ActivePhysics *apOther);
 	void yoshiCollision(ActivePhysics *apThis, ActivePhysics *apOther);
@@ -215,7 +215,7 @@ daSamurshai *daSamurshai::build() {
 
 
 	void daSamurshai::addScoreWhenHit(void *other) { }
-	void daSamurshai::powBlockActivated(bool isMPGP) { }
+	void daSamurshai::powBlockActivated(bool isNotMPGP) { }
 
 	bool daSamurshai::calculateTileCollisions() {
 		// Returns true if sprite should turn, false if not.
diff --git a/src/bossThwompaDomp.cpp b/src/bossThwompaDomp.cpp
index e63191b..d471a00 100644
--- a/src/bossThwompaDomp.cpp
+++ b/src/bossThwompaDomp.cpp
@@ -55,7 +55,7 @@ class daEnMegaDosun_c : public daBoss {
 	bool collisionCat14_YoshiFire(ActivePhysics *apThis, ActivePhysics *apOther);
 	bool collisionCatA_PenguinMario(ActivePhysics *apThis, ActivePhysics *apOther);
 
-	void powBlockActivated(bool isMPGP);
+	void powBlockActivated(bool isNotMPGP);
 
 	USING_STATES(daEnMegaDosun_c);
 	DECLARE_STATE(UpWait);
@@ -83,7 +83,7 @@ daEnMegaDosun_c *daEnMegaDosun_c::build() {
 	return new(buffer) daEnMegaDosun_c;
 }
 
-void daEnMegaDosun_c::powBlockActivated(bool isMPGP) { }
+void daEnMegaDosun_c::powBlockActivated(bool isNotMPGP) { }
 
 // Collisions
 
diff --git a/src/bossTopman.cpp b/src/bossTopman.cpp
index 424f1a3..88b6dd5 100644
--- a/src/bossTopman.cpp
+++ b/src/bossTopman.cpp
@@ -39,7 +39,7 @@ public:
 	void updateModelMatrices();
 	bool calculateTileCollisions();
 
-	void powBlockActivated(bool isMPGP);
+	void powBlockActivated(bool isNotMPGP);
 
 	void spriteCollision(ActivePhysics *apThis, ActivePhysics *apOther);
 	void playerCollision(ActivePhysics *apThis, ActivePhysics *apOther);
@@ -237,7 +237,7 @@ daDreidel *daDreidel::build() {
 	bool daDreidel::collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther) { return true; }
 	bool daDreidel::collisionCat2_IceBall_15_YoshiIce(ActivePhysics *apThis, ActivePhysics *apOther) { return true; }
 
-void daDreidel::powBlockActivated(bool isMPGP) { }
+void daDreidel::powBlockActivated(bool isNotMPGP) { }
 
 
 bool daDreidel::calculateTileCollisions() {
diff --git a/src/chestnut.cpp b/src/chestnut.cpp
index def7041..10ff076 100644
--- a/src/chestnut.cpp
+++ b/src/chestnut.cpp
@@ -37,7 +37,7 @@ class daEnChestnut_c : public dEn_c {
 		bool CreateIceActors();
 
 		u32 canBePowed();
-		void powBlockActivated(bool isMPGP);
+		void powBlockActivated(bool isNotMPGP);
 
 		USING_STATES(daEnChestnut_c);
 		DECLARE_STATE(Idle);
@@ -278,8 +278,8 @@ bool daEnChestnut_c::CreateIceActors() {
 u32 daEnChestnut_c::canBePowed() {
 	return true;
 }
-void daEnChestnut_c::powBlockActivated(bool isMPGP) {
-	if (isMPGP)
+void daEnChestnut_c::powBlockActivated(bool isNotMPGP) {
+	if (!isNotMPGP)
 		return;
 
 	dStateBase_c *state = acState.getCurrentState();
diff --git a/src/shyguyGiants.cpp b/src/shyguyGiants.cpp
index a617e88..aefcb3c 100644
--- a/src/shyguyGiants.cpp
+++ b/src/shyguyGiants.cpp
@@ -74,7 +74,7 @@ class daShyGuyGiant : public dEn_c {
 	bool collisionCat5_Mario(ActivePhysics *apThis, ActivePhysics *apOther);
 	bool collisionCat11_PipeCannon(ActivePhysics *apThis, ActivePhysics *apOther);
 
-	void powBlockActivated(bool isMPGP);
+	void powBlockActivated(bool isNotMPGP);
 
 	void _vf148();
 	void _vf14C();
@@ -259,7 +259,7 @@ void daShyGuyGiant::_vf278(void *other) {
 	void daShyGuyGiant::_vf264(dStageActor_c *other) { } // if other is player or yoshi, do Wm_en_hit and a few other things
 	void daShyGuyGiant::_vf268(void *other) { } // AcPy/PlBase? plays the SE_EMY_DOWN_SPIN_%d sounds based on some value
 
-	void daShyGuyGiant::powBlockActivated(bool isMPGP) {
+	void daShyGuyGiant::powBlockActivated(bool isNotMPGP) {
 	}
 
 bool daShyGuyGiant::calculateTileCollisions() {
diff --git a/src/thundercloud.cpp b/src/thundercloud.cpp
index 2297f8e..116d076 100755
--- a/src/thundercloud.cpp
+++ b/src/thundercloud.cpp
@@ -58,7 +58,7 @@ class dThunderCloud : public dEn_c {
 
 	void bindAnimChr_and_setUpdateRate(const char* name, int unk, float unk2, float rate);
 
-	void powBlockActivated(bool isMPGP);
+	void powBlockActivated(bool isNotMPGP);
 
 	void _vf148();
 	void _vf14C();
@@ -82,7 +82,7 @@ CREATE_STATE(dThunderCloud, Follow);
 CREATE_STATE(dThunderCloud, Lightning);
 CREATE_STATE(dThunderCloud, Wait);
 
-void dThunderCloud::powBlockActivated(bool isMPGP) { }
+void dThunderCloud::powBlockActivated(bool isNotMPGP) { }
 
 
 // Collision Callbacks