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

Cannot communicate with Ilwrath via caster when they are dead (bug #850); some pOrbitalDesc usage cleanup

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3586 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2011-04-24 19:47:22 +00:00
parent 18692267fb
commit 3178ac72a2
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+1
View File
@@ -1,4 +1,5 @@
Changes towards version 0.7: Changes towards version 0.7:
- Fixed 'caster comm with Ilwrath after they die off (bug #850) - Alex
- Fixed Syreen Vault lander report infinite loop (bug #1118) - Alex - Fixed Syreen Vault lander report infinite loop (bug #1118) - Alex
- Same captain names are used on both net sides (bug #989) - Alex - Same captain names are used on both net sides (bug #989) - Alex
- Fixed sync loss in netplay games having duplicate ships (bug #1081) - Alex - Fixed sync loss in netplay games having duplicate ships (bug #1081) - Alex
sc2/src/uqm/planets/devices.c
+9 -6
View File
@@ -231,8 +231,9 @@ UseCaster (void)
|| !playerInSolarSystem ()) || !playerInSolarSystem ())
return FALSE; return FALSE;
if (pSolarSysState->pOrbitalDesc == &pSolarSysState->PlanetDesc[1] if (playerInPlanetOrbit ()
&& playerInPlanetOrbit () && matchWorld (pSolarSysState, pSolarSysState->pOrbitalDesc,
1, MATCH_PLANET)
&& CurStarDescPtr->Index == CHMMR_DEFINED && CurStarDescPtr->Index == CHMMR_DEFINED
&& !GET_GAME_STATE (CHMMR_UNLEASHED)) && !GET_GAME_STATE (CHMMR_UNLEASHED))
{ {
@@ -254,8 +255,9 @@ UseCaster (void)
BOOLEAN FoundIlwrath; BOOLEAN FoundIlwrath;
HIPGROUP hGroup; HIPGROUP hGroup;
FoundIlwrath = (BOOLEAN)(CurStarDescPtr->Index == ILWRATH_DEFINED); FoundIlwrath = (CurStarDescPtr->Index == ILWRATH_DEFINED)
// In the Ilwrath home system? && ActivateStarShip (ILWRATH_SHIP, SPHERE_TRACKING);
// In the Ilwrath home system and they are alive?
if (!FoundIlwrath && if (!FoundIlwrath &&
(hGroup = GetHeadLink (&GLOBAL (ip_group_q)))) (hGroup = GetHeadLink (&GLOBAL (ip_group_q))))
@@ -328,8 +330,9 @@ InvokeDevice (BYTE which_device)
SleepThreadUntil (FadeScreen (FadeAllToWhite, ONE_SECOND * 1) SleepThreadUntil (FadeScreen (FadeAllToWhite, ONE_SECOND * 1)
+ (ONE_SECOND * 2)); + (ONE_SECOND * 2));
if (CurStarDescPtr->Index != CHMMR_DEFINED if (CurStarDescPtr->Index != CHMMR_DEFINED
|| pSolarSysState->pOrbitalDesc != || !matchWorld (pSolarSysState,
&pSolarSysState->PlanetDesc[1]) pSolarSysState->pOrbitalDesc,
1, MATCH_PLANET))
{ {
FadeScreen (FadeAllToColor, ONE_SECOND * 2); FadeScreen (FadeAllToColor, ONE_SECOND * 2);
} }