extinguish Lara during DOZY (closes #4)

This commit is contained in:
rr- 2021-02-27 18:47:00 +01:00
parent e8e8efb573
commit 622f61b64c

View file

@ -18,6 +18,14 @@ void FlameControl(int16_t fx_num)
} }
if (fx->counter < 0) { if (fx->counter < 0) {
#ifdef T1M_FEAT_CHEATS
if (Lara.water_status == LWS_CHEAT) {
fx->counter = 0;
StopSoundEffect(150, NULL);
KillEffect(fx_num);
}
#endif
fx->pos.x = 0; fx->pos.x = 0;
fx->pos.y = 0; fx->pos.y = 0;
if (fx->counter == -1) { if (fx->counter == -1) {
@ -53,6 +61,12 @@ void FlameControl(int16_t fx_num)
if (fx->counter) { if (fx->counter) {
fx->counter--; fx->counter--;
} else if (ItemNearLara(&fx->pos, 600)) { } else if (ItemNearLara(&fx->pos, 600)) {
#ifdef T1M_FEAT_CHEATS
if (Lara.water_status == LWS_CHEAT) {
return;
}
#endif
int32_t x = LaraItem->pos.x - fx->pos.x; int32_t x = LaraItem->pos.x - fx->pos.x;
int32_t z = LaraItem->pos.z - fx->pos.z; int32_t z = LaraItem->pos.z - fx->pos.z;
int32_t distance = SQUARE(x) + SQUARE(z); int32_t distance = SQUARE(x) + SQUARE(z);
@ -76,6 +90,12 @@ void FlameControl(int16_t fx_num)
void LavaBurn(ITEM_INFO* item) void LavaBurn(ITEM_INFO* item)
{ {
#ifdef T1M_FEAT_CHEATS
if (Lara.water_status == LWS_CHEAT) {
return;
}
#endif
if (item->hit_points < 0) { if (item->hit_points < 0) {
return; return;
} }