diff --git a/sc2/ChangeLog b/sc2/ChangeLog index 1ede4ee13..12dccfa07 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,6 @@ Changes towards version 0.6: +- Fixed recently introduced bug with crew count on exit to HyperSpace. + (bug #875) - SvdB - Fixed static vars not reinited in alien comm code (caused various side-effects; bug #870) - Alex - Fixed a spinlock in Melee's final score screen (Bug 879) - Michael diff --git a/sc2/src/sc2code/ships/sis_ship/sis_ship.c b/sc2/src/sc2code/ships/sis_ship/sis_ship.c index a20979ee1..14bbf7c1c 100644 --- a/sc2/src/sc2code/ships/sis_ship/sis_ship.c +++ b/sc2/src/sc2code/ships/sis_ship/sis_ship.c @@ -239,8 +239,7 @@ LeaveAutoPilot: speed = square_root ((long)dx * dx + (long)dy * dy); if (AccelerateDirection < 0) { - dy = (speed / velocity_increment - 1) - * velocity_increment; + dy = (speed / velocity_increment - 1) * velocity_increment; if (dy < speed - velocity_increment) dy = speed - velocity_increment; if ((speed = dy) < 0) @@ -853,12 +852,11 @@ init_sis (void) (void (*) (PVOID ShipPtr, PVOID ObjectsOfConcern, COUNT ConcernCounter)) sis_intelligence; - InitModuleSlots(&new_sis_desc, GLOBAL_SIS (ModuleSlots)); - if (GET_GAME_STATE (CHMMR_BOMB_STATE) == 3) SET_GAME_STATE (BOMB_CARRIER, 1); } + InitModuleSlots(&new_sis_desc, GLOBAL_SIS (ModuleSlots)); InitDriveSlots(&new_sis_desc, GLOBAL_SIS (DriveSlots)); InitJetSlots(&new_sis_desc, GLOBAL_SIS (JetSlots));