summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/bossMegaGoomba.cpp5
-rw-r--r--src/koopatlas/hud.cpp2
-rw-r--r--src/koopatlas/shop.cpp6
3 files changed, 5 insertions, 8 deletions
diff --git a/src/bossMegaGoomba.cpp b/src/bossMegaGoomba.cpp
index f2f66be..6314aaf 100644
--- a/src/bossMegaGoomba.cpp
+++ b/src/bossMegaGoomba.cpp
@@ -299,10 +299,7 @@ void daMegaGoomba_c::collisionCatA_PenguinMario(ActivePhysics *apThis, ActivePhy
}
void daMegaGoomba_c::collisionCatD_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther) { }
void daMegaGoomba_c::collisionCat11_PipeCannon(ActivePhysics *apThis, ActivePhysics *apOther) {}
-void daMegaGoomba_c::collisionCat13_Hammer(ActivePhysics *apThis, ActivePhysics *apOther) {
- if(this->takeHit(1))
- doStateChange(&StateID_DieFall);
-}
+void daMegaGoomba_c::collisionCat13_Hammer(ActivePhysics *apThis, ActivePhysics *apOther) {}
void daMegaGoomba_c::collisionCat14_YoshiFire(ActivePhysics *apThis, ActivePhysics *apOther) {
if(this->takeHit(1))
doStateChange(&StateID_DieFall);
diff --git a/src/koopatlas/hud.cpp b/src/koopatlas/hud.cpp
index ab093ef..4d678c6 100644
--- a/src/koopatlas/hud.cpp
+++ b/src/koopatlas/hud.cpp
@@ -142,7 +142,7 @@ int dWMHud_c::onExecute() {
setupLives(); // FUCK IT
updatePressableButtonThingies();
- int scCount = getStarCoinCount();
+ int scCount = getUnspentStarCoinCount();
WriteNumberToTextBox(&scCount, StarCoinCounter, false);
layout.execAnimations();
diff --git a/src/koopatlas/shop.cpp b/src/koopatlas/shop.cpp
index 4ee20f7..025a7d9 100644
--- a/src/koopatlas/shop.cpp
+++ b/src/koopatlas/shop.cpp
@@ -519,7 +519,7 @@ void dWMShop_c::loadInfo() {
TitleShadow->SetString(shopName);
// load the coin count
- int scCount = getStarCoinCount();
+ int scCount = getUnspentStarCoinCount();
WriteNumberToTextBox(&scCount, CoinCount, false);
WriteNumberToTextBox(&scCount, CoinCountShadow, false);
}
@@ -532,7 +532,7 @@ void dWMShop_c::buyItem(int item) {
{5, 4, 3}, {8, 7, 5}
};
- int cost = itemDefs[item][0], cash = getStarCoinCount();
+ int cost = itemDefs[item][0], cash = getUnspentStarCoinCount();
if (cost > cash) {
lakituModel->playAnim("notenough", 1.0f, 1);
@@ -580,7 +580,7 @@ void dWMShop_c::buyItem(int item) {
}
// load the coin count
- int scCount = getStarCoinCount();
+ int scCount = getUnspentStarCoinCount();
WriteNumberToTextBox(&scCount, CoinCount, false);
WriteNumberToTextBox(&scCount, CoinCountShadow, false);