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

Keep 'Entering planetary orbit...' screen on while a planet is zooming in

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3415 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2009-12-10 09:26:57 +00:00
parent 70e7ae8204
commit 212f9a68ea
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/uqm/planets/planets.c
+9 -7
View File
@@ -185,12 +185,9 @@ DrawOrbitalDisplay (DRAW_ORBITAL_MODE Mode)
UnbatchGraphics (); UnbatchGraphics ();
if (Mode != DRAW_ORBITAL_WAIT)
{
// for later RepairBackRect() // for later RepairBackRect()
LoadIntoExtraScreen (&r); LoadIntoExtraScreen (&r);
} }
}
// Initialise the surface graphics, and start the planet music. // Initialise the surface graphics, and start the planet music.
// Called from the GenerateFunctions.generateOribital() function // Called from the GenerateFunctions.generateOribital() function
@@ -227,10 +224,6 @@ LoadPlanet (FRAME SurfDefFrame)
SetPlanetMusic (pPlanetDesc->data_index & ~PLANET_SHIELDED); SetPlanetMusic (pPlanetDesc->data_index & ~PLANET_SHIELDED);
GeneratePlanetSide (); GeneratePlanetSide ();
LockMutex (GraphicsLock);
DrawOrbitalDisplay (WaitMode ? DRAW_ORBITAL_UPDATE : DRAW_ORBITAL_FULL);
UnlockMutex (GraphicsLock);
if (!PLRPlaying ((MUSIC_REF)~0)) if (!PLRPlaying ((MUSIC_REF)~0))
PlayMusic (LanderMusic, TRUE, 1); PlayMusic (LanderMusic, TRUE, 1);
@@ -238,6 +231,15 @@ LoadPlanet (FRAME SurfDefFrame)
{ {
assert (pSolarSysState->MenuState.Initialized == 2); assert (pSolarSysState->MenuState.Initialized == 2);
ZoomInPlanetSphere (); ZoomInPlanetSphere ();
LockMutex (GraphicsLock);
DrawOrbitalDisplay (DRAW_ORBITAL_UPDATE);
UnlockMutex (GraphicsLock);
}
else
{
LockMutex (GraphicsLock);
DrawOrbitalDisplay (DRAW_ORBITAL_FULL);
UnlockMutex (GraphicsLock);
} }
// XXX: Mark as in-orbit. This should go away eventually // XXX: Mark as in-orbit. This should go away eventually