adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed recently introduced bug with crew count on leaving HyperSpace (bug 875).

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2316 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2006-04-21 03:29:38 +00:00
parent cd0609417b
commit ea458a7ba0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+2
View File
@@ -1,4 +1,6 @@
Changes towards version 0.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 - Fixed static vars not reinited in alien comm code (caused various
side-effects; bug #870) - Alex side-effects; bug #870) - Alex
- Fixed a spinlock in Melee's final score screen (Bug 879) - Michael - Fixed a spinlock in Melee's final score screen (Bug 879) - Michael
sc2/src/sc2code/ships/sis_ship/sis_ship.c
+2 -4
View File
@@ -239,8 +239,7 @@ LeaveAutoPilot:
speed = square_root ((long)dx * dx + (long)dy * dy); speed = square_root ((long)dx * dx + (long)dy * dy);
if (AccelerateDirection < 0) if (AccelerateDirection < 0)
{ {
dy = (speed / velocity_increment - 1) dy = (speed / velocity_increment - 1) * velocity_increment;
* velocity_increment;
if (dy < speed - velocity_increment) if (dy < speed - velocity_increment)
dy = speed - velocity_increment; dy = speed - velocity_increment;
if ((speed = dy) < 0) if ((speed = dy) < 0)
@@ -853,12 +852,11 @@ init_sis (void)
(void (*) (PVOID ShipPtr, PVOID ObjectsOfConcern, (void (*) (PVOID ShipPtr, PVOID ObjectsOfConcern,
COUNT ConcernCounter)) sis_intelligence; COUNT ConcernCounter)) sis_intelligence;
InitModuleSlots(&new_sis_desc, GLOBAL_SIS (ModuleSlots));
if (GET_GAME_STATE (CHMMR_BOMB_STATE) == 3) if (GET_GAME_STATE (CHMMR_BOMB_STATE) == 3)
SET_GAME_STATE (BOMB_CARRIER, 1); SET_GAME_STATE (BOMB_CARRIER, 1);
} }
InitModuleSlots(&new_sis_desc, GLOBAL_SIS (ModuleSlots));
InitDriveSlots(&new_sis_desc, GLOBAL_SIS (DriveSlots)); InitDriveSlots(&new_sis_desc, GLOBAL_SIS (DriveSlots));
InitJetSlots(&new_sis_desc, GLOBAL_SIS (JetSlots)); InitJetSlots(&new_sis_desc, GLOBAL_SIS (JetSlots));