From bd092ca8446444d391ee7205e67093856e4259ec Mon Sep 17 00:00:00 2001 From: avolkov Date: Wed, 1 Jul 2009 20:31:49 +0000 Subject: [PATCH] Fixed Mmrnmhrm's X-Form transformation without energy use; bug #1004 git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3166 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/ChangeLog | 1 + sc2/src/sc2code/ships/mmrnmhrm/mmrnmhrm.c | 10 +++------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/sc2/ChangeLog b/sc2/ChangeLog index 49a866fe3..8098a0b3f 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,5 @@ Changes towards version 0.7: +- Fixed Mmrnmhrm's X-Form transformation without energy use (bug #1004) - Alex - Added missing sleeps in DoInput() functions (bug #893) - Alex - Starmap unit conversion corrections; fixes bug #970 - Alex - Rounding-error correction in log(x|y)ToUniverse (bug #1046), from Nic diff --git a/sc2/src/sc2code/ships/mmrnmhrm/mmrnmhrm.c b/sc2/src/sc2code/ships/mmrnmhrm/mmrnmhrm.c index ab02d1625..66c51138d 100644 --- a/sc2/src/sc2code/ships/mmrnmhrm/mmrnmhrm.c +++ b/sc2/src/sc2code/ships/mmrnmhrm/mmrnmhrm.c @@ -369,8 +369,6 @@ mmrnmhrm_postprocess (ELEMENT *ElementPtr) ProcessSound (SetAbsSoundIndex ( /* TRANSFORM */ StarShipPtr->RaceDescPtr->ship_data.ship_sounds, 1), ElementPtr); - DeltaEnergy (ElementPtr, - -StarShipPtr->RaceDescPtr->characteristics.special_energy_cost); StarShipPtr->weapon_counter = 0; @@ -434,11 +432,9 @@ mmrnmhrm_preprocess (ELEMENT *ElementPtr) if ((StarShipPtr->cur_status_flags & SPECIAL) && StarShipPtr->special_counter == 0) { - if (StarShipPtr->RaceDescPtr->ship_info.energy_level < - StarShipPtr->RaceDescPtr->characteristics.special_energy_cost) - DeltaEnergy (ElementPtr, - -StarShipPtr->RaceDescPtr->characteristics.special_energy_cost); /* so text will flash */ - else + /* Either we transform or text will flash */ + if (DeltaEnergy (ElementPtr, + -StarShipPtr->RaceDescPtr->characteristics.special_energy_cost)) { if (ElementPtr->next.image.farray == StarShipPtr->RaceDescPtr->ship_data.ship) ElementPtr->next.image.farray =