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

Do not overwrite GLOBAL_SIS (CrewEnlisted) when leaving HyperSpace.

Browse Source 
This fixes bug #938.  Entering combat while *in* HyperSpace appears to 
still update crew counts appropriately.



git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2646 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
mcmartin
2007-01-08 02:26:13 +00:00
parent 7903e083b0
commit 83915976bd
2 changed files with 8 additions and 3 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.7: Changes towards version 0.7:
- Do not overwrite GLOBAL_SIS (CrewEnlisted) when leaving Hyperspace
(Bug #938) - Michael
- Fixed a text entry width problem that was deleting control template - Fixed a text entry width problem that was deleting control template
names (Bug #947) - Michael names (Bug #947) - Michael
- uio cleanups, documentation - SvdB - uio cleanups, documentation - SvdB
sc2/src/sc2code/ships/sis_ship/sis_ship.c
+3
View File
@@ -880,10 +880,13 @@ init_sis (void)
void void
uninit_sis (RACE_DESCPTR pRaceDesc) uninit_sis (RACE_DESCPTR pRaceDesc)
{
if (LOBYTE (GLOBAL (CurrentActivity)) != IN_HYPERSPACE)
{ {
GLOBAL_SIS (CrewEnlisted) = pRaceDesc->ship_info.crew_level; GLOBAL_SIS (CrewEnlisted) = pRaceDesc->ship_info.crew_level;
if (pRaceDesc->ship_info.ship_flags & PLAYER_CAPTAIN) if (pRaceDesc->ship_info.ship_flags & PLAYER_CAPTAIN)
GLOBAL_SIS (CrewEnlisted)--; GLOBAL_SIS (CrewEnlisted)--;
} }
}