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

Make finishing the game w/o using the Starbase possible; fixes bug #592

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1617 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2005-04-08 02:17:13 +00:00
parent 5e2b328d98
commit ba4ff834b5
5 changed files with 133 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/comm/chmmr/chmmrc.c
+71 -20
View File
@@ -119,7 +119,7 @@ ExitConversation (RESPONSE_REF R)
NPCPhrase (GOODBYE_AFTER_BOMB);
else if (PLAYER_SAID (R, proceed))
{
BYTE i;
int i;
NPCPhrase (TAKE_2_WEEKS);
@@ -130,20 +130,82 @@ ExitConversation (RESPONSE_REF R)
SET_GAME_STATE (CHMMR_BOMB_STATE, 2);
SET_GAME_STATE (UTWIG_BOMB_ON_SHIP, 0);
GLOBAL_SIS (ResUnits) = 1000000L;
GLOBAL_SIS (FuelOnBoard) = FUEL_RESERVE;
GLOBAL_SIS (CrewEnlisted) = 0;
GLOBAL_SIS (NumLanders) = 0;
GLOBAL (ModuleCost[PLANET_LANDER]) = 0;
GLOBAL (ModuleCost[STORAGE_BAY]) = 0;
GLOBAL_SIS (TotalElementMass) = 0;
for (i = 0; i < NUM_ELEMENT_CATEGORIES; ++i)
GLOBAL_SIS (ElementAmounts[i]) = 0;
#define EARTH_INDEX 2 /* earth is 3rd planet --> 3 - 1 = 2 */
/* Magic numbers for Earth */
#define EARTH_OUTER_X (-725)
#define EARTH_OUTER_Y (597)
#define EARTH_INNER_X (121)
#define EARTH_INNER_Y (113)
/* Magic numbers for Earth Starbase */
#define STARBASE_INNER_X (86)
#define STARBASE_INNER_Y (113)
/* transport player to Earth */
GLOBAL_SIS (log_x) = UNIVERSE_TO_LOGX (SOL_X);
GLOBAL_SIS (log_y) = UNIVERSE_TO_LOGY (SOL_Y);
GLOBAL (ShipStamp.frame) = (FRAME)MAKE_DWORD (1, EARTH_INDEX + 1);
/* XXX : this should be unhardcoded eventually */
GLOBAL (ip_location.x) = EARTH_OUTER_X;
GLOBAL (ip_location.y) = EARTH_OUTER_Y;
if (GET_GAME_STATE (STARBASE_AVAILABLE))
{ /* Normal game mode - you are transported to Starbase */
GLOBAL_SIS (FuelOnBoard) = FUEL_RESERVE;
GLOBAL_SIS (CrewEnlisted) = 0;
GLOBAL_SIS (TotalElementMass) = 0;
GLOBAL (ModuleCost[STORAGE_BAY]) = 0; /* disable Storage Bay */
for (i = 0; i < NUM_ELEMENT_CATEGORIES; ++i)
GLOBAL_SIS (ElementAmounts[i]) = 0;
for (i = NUM_BOMB_MODULES; i < NUM_MODULE_SLOTS; ++i)
GLOBAL_SIS (ModuleSlots[i]) = EMPTY_SLOT + 2;
/* XXX : this should be unhardcoded eventually */
/* transport to Starbase */
GLOBAL (ShipStamp.origin.x) = STARBASE_INNER_X - SAFE_X;
GLOBAL (ShipStamp.origin.y) = STARBASE_INNER_Y - SAFE_Y;
}
else
{ /* 'Beating Game Differently' mode - never visited Starbase,
* so you are transported to Earth */
/* compress the layout -- move all to front */
for (i = NUM_MODULE_SLOTS - 1; i > 0; --i)
{
int m;
/* find next unused slot */
for (; i > 0
&& GLOBAL_SIS (ModuleSlots[i]) != EMPTY_SLOT + 2;
--i)
;
if (i == 0)
break;
/* find next module to move */
for (m = i - 1; m >= 0
&& GLOBAL_SIS (ModuleSlots[m]) == EMPTY_SLOT + 2;
--m)
;
if (m < 0)
break;
/* move the module */
GLOBAL_SIS (ModuleSlots[i]) = GLOBAL_SIS (ModuleSlots[m]);
GLOBAL_SIS (ModuleSlots[m]) = EMPTY_SLOT + 2;
}
/* XXX : this should be unhardcoded eventually */
/* transport to Earth itself */
GLOBAL (ShipStamp.origin.x) = EARTH_INNER_X - SAFE_X;
GLOBAL (ShipStamp.origin.y) = EARTH_INNER_Y - SAFE_Y;
}
/* install Chmmr-supplied modules */
for (i = 0; i < NUM_DRIVE_SLOTS; ++i)
GLOBAL_SIS (DriveSlots[i]) = FUSION_THRUSTER;
for (i = 0; i < NUM_JET_SLOTS; ++i)
GLOBAL_SIS (JetSlots[i]) = TURNING_JETS;
for (i = NUM_BOMB_MODULES; i < NUM_MODULE_SLOTS; ++i)
GLOBAL_SIS (ModuleSlots[i]) = EMPTY_SLOT + 2;
GLOBAL_SIS (ModuleSlots[0]) = BOMB_MODULE_4;
GLOBAL_SIS (ModuleSlots[1]) = BOMB_MODULE_5;
GLOBAL_SIS (ModuleSlots[2]) = BOMB_MODULE_3;
@@ -154,17 +216,6 @@ ExitConversation (RESPONSE_REF R)
GLOBAL_SIS (ModuleSlots[7]) = BOMB_MODULE_4;
GLOBAL_SIS (ModuleSlots[8]) = BOMB_MODULE_5;
GLOBAL_SIS (ModuleSlots[9]) = BOMB_MODULE_2;
#define EARTH_INDEX 2 /* earth is 3rd planet --> 3 - 1 = 2 */
GLOBAL_SIS (log_x) = UNIVERSE_TO_LOGX (SOL_X);
GLOBAL_SIS (log_y) = UNIVERSE_TO_LOGY (SOL_Y);
GLOBAL (ShipStamp.frame) =
(FRAME)MAKE_DWORD (1, EARTH_INDEX + 1);
/* Magic numbers for Earth */
GLOBAL (ip_location.x) = -725;
GLOBAL (ip_location.y) = 597;
GLOBAL (ShipStamp.origin.x) = 86 - SAFE_X;
GLOBAL (ShipStamp.origin.y) = 113 - SAFE_Y;
}
}
sc2/src/sc2code/comm/comandr/comandr.c
+6 -3
View File
@@ -252,7 +252,8 @@ NoRadioactives (RESPONSE_REF R)
GiveRadios (NULL_PTR);
else
{
if (GLOBAL_SIS (NumLanders) == 0)
if (GLOBAL_SIS (NumLanders) == 0
&& GET_GAME_STATE (CHMMR_BOMB_STATE) < 2)
{
if (GET_GAME_STATE (LANDERS_LOST))
Response (i_lost_another_lander, NoRadioactives);
@@ -323,7 +324,8 @@ AskAfterRadios (RESPONSE_REF R)
}
{
if (GLOBAL_SIS (NumLanders) == 0)
if (GLOBAL_SIS (NumLanders) == 0
&& GET_GAME_STATE (CHMMR_BOMB_STATE) < 2)
{
if (GET_GAME_STATE (LANDERS_LOST))
Response (i_lost_another_lander, AskAfterRadios);
@@ -430,7 +432,8 @@ TellMoonBase (RESPONSE_REF R)
NPCPhrase (ABOUT_BASE_AGAIN);
}
if (GLOBAL_SIS (NumLanders) == 0)
if (GLOBAL_SIS (NumLanders) == 0
&& GET_GAME_STATE (CHMMR_BOMB_STATE) < 2)
{
if (GET_GAME_STATE (LANDERS_LOST))
Response (i_lost_another_lander, TellMoonBase);
sc2/src/sc2code/starbase.c
+43 -15
View File
@@ -432,6 +432,26 @@ ExitStarBase:
return (TRUE);
}
static void
DoTimePassage (void)
{
#define LOST_DAYS 14
COUNT i;
BYTE clut_buf[1];
clut_buf[0] = FadeAllToBlack;
SleepThreadUntil (XFormColorMap ((COLORMAPPTR)clut_buf, ONE_SECOND * 2));
for (i = 0; i < LOST_DAYS; ++i)
{
while (ClockTick () > 0)
;
ResumeGameClock ();
SleepThread (ONE_SECOND / 60);
SuspendGameClock ();
}
}
void
VisitStarBase (void)
{
@@ -474,26 +494,12 @@ VisitStarBase (void)
SET_GAME_STATE (GLOBAL_FLAGS_AND_DATA, (BYTE)~0);
{
#define LOST_DAYS 14
COUNT i;
BYTE clut_buf[1];
pMenuState = &MenuState;
InitCommunication (COMMANDER_CONVERSATION);
TimePassage:
SET_GAME_STATE (GLOBAL_FLAGS_AND_DATA, (BYTE)~0);
clut_buf[0] = FadeAllToBlack;
SleepThreadUntil (XFormColorMap ((COLORMAPPTR)clut_buf, ONE_SECOND * 2));
for (i = 0; i < LOST_DAYS; ++i)
{
while (ClockTick () > 0)
;
ResumeGameClock ();
SleepThread (ONE_SECOND / 60);
SuspendGameClock ();
}
DoTimePassage ();
}
}
@@ -527,6 +533,28 @@ ExitStarBase:
}
}
void
InstallBombAtEarth (void)
{
BYTE clut_buf[1];
DoTimePassage ();
LockMutex (GraphicsLock);
SetContext (ScreenContext);
SetTransitionSource (NULL);
SetContextBackGroundColor (BLACK_COLOR);
ClearDrawable ();
UnlockMutex (GraphicsLock);
clut_buf[0] = FadeAllToColor;
SleepThreadUntil (XFormColorMap ((COLORMAPPTR)clut_buf, 0));
SET_GAME_STATE (CHMMR_BOMB_STATE, 3); /* bomb processed */
GLOBAL (CurrentActivity) = CHECK_LOAD; /* fake a load game */
CurStarDescPtr = 0; /* force SolarSys reload */
}
// XXX: Doesn't really belong in this file.
COUNT
WrapText (const UNICODE *pStr, COUNT len, TEXT *tarray, SIZE field_width)
sc2/src/sc2code/starbase.h
+1
View File
@@ -59,6 +59,7 @@ typedef MENU_STATE *PMENU_STATE;
extern PMENU_STATE pMenuState;
extern void InstallBombAtEarth (void);
extern void VisitStarBase (void);
extern BOOLEAN DoStarBase (PMENU_STATE pMS);
extern BOOLEAN DoOutfit (PMENU_STATE pMS);
sc2/src/sc2code/starcon.c
+12 -2
View File
@@ -149,12 +149,22 @@ while (--ac > 0)
if ((GLOBAL (CurrentActivity) & START_ENCOUNTER)
|| GET_GAME_STATE (CHMMR_BOMB_STATE) == 2)
{
GLOBAL (CurrentActivity) |= START_ENCOUNTER;
if (GET_GAME_STATE (GLOBAL_FLAGS_AND_DATA) == (BYTE)~0
if (GET_GAME_STATE (CHMMR_BOMB_STATE) == 2
&& !GET_GAME_STATE (STARBASE_AVAILABLE))
{ /* BGD mode */
InstallBombAtEarth ();
}
else if (GET_GAME_STATE (GLOBAL_FLAGS_AND_DATA) == (BYTE)~0
|| GET_GAME_STATE (CHMMR_BOMB_STATE) == 2)
{
GLOBAL (CurrentActivity) |= START_ENCOUNTER;
VisitStarBase ();
}
else
{
GLOBAL (CurrentActivity) |= START_ENCOUNTER;
RaceCommunication ();
}
if (!(GLOBAL (CurrentActivity) & (CHECK_ABORT | CHECK_LOAD)))
{