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

Preserve SIS facing through an encounter in Hyperspace

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1614 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2005-04-08 01:00:24 +00:00
parent 4ac7efd0a5
commit e595b8c0ee
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/hyper.c
+3 -1
View File
@@ -446,14 +446,15 @@ unhyper_transition (PELEMENT ElementPtr)
{ {
cleanup_hyperspace (); cleanup_hyperspace ();
GLOBAL (ShipStamp.frame) = 0;
GLOBAL (CurrentActivity) &= ~IN_BATTLE; GLOBAL (CurrentActivity) &= ~IN_BATTLE;
switch (ElementPtr->turn_wait) switch (ElementPtr->turn_wait)
{ {
case RANDOM_ENCOUNTER_TRANSITION: case RANDOM_ENCOUNTER_TRANSITION:
SaveFlagshipState ();
GLOBAL (CurrentActivity) |= START_ENCOUNTER; GLOBAL (CurrentActivity) |= START_ENCOUNTER;
break; break;
case INTERPLANETARY_TRANSITION: case INTERPLANETARY_TRANSITION:
GLOBAL (ShipStamp.frame) = 0;
SET_GAME_STATE (USED_BROADCASTER, 0); SET_GAME_STATE (USED_BROADCASTER, 0);
if (GET_GAME_STATE (ARILOU_SPACE_SIDE) <= 1) if (GET_GAME_STATE (ARILOU_SPACE_SIDE) <= 1)
{ {
@@ -512,6 +513,7 @@ unhyper_transition (PELEMENT ElementPtr)
* or HyperSpace from QuasiSpace through the periodically * or HyperSpace from QuasiSpace through the periodically
* opening portal. * opening portal.
*/ */
GLOBAL (ShipStamp.frame) = 0;
SET_GAME_STATE (USED_BROADCASTER, 0); SET_GAME_STATE (USED_BROADCASTER, 0);
GLOBAL (autopilot.x) = GLOBAL (autopilot.x) =
GLOBAL (autopilot.y) = ~0; GLOBAL (autopilot.y) = ~0;