From ea458a7ba0cafc7e239ccbbb291c0bf797e8e1b0 Mon Sep 17 00:00:00 2001 From: meep-eep Date: Fri, 21 Apr 2006 03:29:38 +0000 Subject: [PATCH] Fixed recently introduced bug with crew count on leaving HyperSpace (bug 875). git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2316 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/ChangeLog | 2 ++ sc2/src/sc2code/ships/sis_ship/sis_ship.c | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) 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));