From d3ad999a9f5391d0128b3b7771adac01716c2e79 Mon Sep 17 00:00:00 2001 From: avolkov Date: Mon, 11 Apr 2005 22:20:27 +0000 Subject: [PATCH] Fixes getting transported to Sol coords in Hyperspace instead of Earth under some conditions (BGD model bug #592) git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1627 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/sc2code/starbase.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sc2/src/sc2code/starbase.c b/sc2/src/sc2code/starbase.c index 6b0c842aa..af015b775 100644 --- a/sc2/src/sc2code/starbase.c +++ b/sc2/src/sc2code/starbase.c @@ -29,6 +29,7 @@ #include "libs/tasklib.h" #include "libs/inplib.h" +extern ACTIVITY NextActivity; PMENU_STATE pMenuState; @@ -524,8 +525,6 @@ TimePassage: ExitStarBase: if (!(GLOBAL (CurrentActivity) & (CHECK_LOAD | CHECK_ABORT))) { - extern ACTIVITY NextActivity; - SET_GAME_STATE (GLOBAL_FLAGS_AND_DATA, 0); GLOBAL (CurrentActivity) = CHECK_LOAD; NextActivity = MAKE_WORD (IN_INTERPLANETARY, 0) @@ -552,6 +551,7 @@ InstallBombAtEarth (void) SET_GAME_STATE (CHMMR_BOMB_STATE, 3); /* bomb processed */ GLOBAL (CurrentActivity) = CHECK_LOAD; /* fake a load game */ + NextActivity = MAKE_WORD (IN_INTERPLANETARY, 0) | START_INTERPLANETARY; CurStarDescPtr = 0; /* force SolarSys reload */ }