From e595b8c0ee5f3d509c5b834f622394b31af6b162 Mon Sep 17 00:00:00 2001
From: avolkov <avolkov@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Fri, 8 Apr 2005 01:00:24 +0000
Subject: [PATCH] Preserve SIS facing through an encounter in Hyperspace

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1614 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/src/sc2code/hyper.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sc2/src/sc2code/hyper.c b/sc2/src/sc2code/hyper.c
index ab74dd54c..2cf49c737 100644
--- a/sc2/src/sc2code/hyper.c
+++ b/sc2/src/sc2code/hyper.c
@@ -446,14 +446,15 @@ unhyper_transition (PELEMENT ElementPtr)
 	{
 		cleanup_hyperspace ();
 
-		GLOBAL (ShipStamp.frame) = 0;
 		GLOBAL (CurrentActivity) &= ~IN_BATTLE;
 		switch (ElementPtr->turn_wait)
 		{
 			case RANDOM_ENCOUNTER_TRANSITION:
+				SaveFlagshipState ();
 				GLOBAL (CurrentActivity) |= START_ENCOUNTER;
 				break;
 			case INTERPLANETARY_TRANSITION:
+				GLOBAL (ShipStamp.frame) = 0;
 				SET_GAME_STATE (USED_BROADCASTER, 0);
 				if (GET_GAME_STATE (ARILOU_SPACE_SIDE) <= 1)
 				{
@@ -512,6 +513,7 @@ unhyper_transition (PELEMENT ElementPtr)
 				 * or HyperSpace from QuasiSpace through the periodically
 				 * opening portal.
 				 */
+				GLOBAL (ShipStamp.frame) = 0;
 				SET_GAME_STATE (USED_BROADCASTER, 0);
 				GLOBAL (autopilot.x) =
 						GLOBAL (autopilot.y) = ~0;