From 00e7c9836b77dfcde5cfec0c38657d9b564c18bb Mon Sep 17 00:00:00 2001
From: Colin Noga <Tempus@chronometry.ca>
Date: Sun, 23 Dec 2012 16:11:41 -0600
Subject: Thundercloud fixes
---
src/thundercloud.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
(limited to 'src')
diff --git a/src/thundercloud.cpp b/src/thundercloud.cpp
index 28778db..597c08f 100755
--- a/src/thundercloud.cpp
+++ b/src/thundercloud.cpp
@@ -91,7 +91,7 @@ CREATE_STATE(dThunderCloud, Wait);
if (this->counter_504[apOther->owner->which_player]) {
if (apThis->info.category2 == 0x9) {
int p = CheckExistingPowerup(apOther->owner);
- if (p != 0 && p != 3) { // Powerups - 0 = small; 1 = big; 2 = fire; 3 = mini; 4 = prop; 5 = peng; 6 = ice; 7 = hammer
+ if (p != 3) { // Powerups - 0 = small; 1 = big; 2 = fire; 3 = mini; 4 = prop; 5 = peng; 6 = ice; 7 = hammer
dAcPy_c__ChangePowerupWithAnimation(apOther->owner, 3);
}
else { dAcPy_vf3F4(apOther->owner, this, 9); }
@@ -418,11 +418,13 @@ void dThunderCloud::beginState_Lightning() {
u32 result = 0;
while (result == 0) {
- below.y -= 0x8000;
+ below.y -= 0x1000;
OSReport("Sending out leader to %d", below.y>>12);
result = collMgr.calculateBelowCollisionWithSmokeEffect();
OSReport("Result %d", result);
+
+ if (below.y>>12 > 800) { result = 1; }
}
OSReport("Lightning strikes at %d", below.y>>12);
--
cgit v1.2.3