mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
Merged revision(s) 7018 from branches/ja2_source_official_2014:
- Fix: reloading while mercs are exiting the helicopter could lock the gamescreen.cpp - Fix: helicopter airdrop could lock up if mercs were in a bad animation - Fix: wrong battle report texts used git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7019 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
+5
-1
@@ -634,10 +634,14 @@ UINT32 MainGameScreenHandle(void)
|
||||
}
|
||||
#else
|
||||
InternalLocateGridNo( gGameExternalOptions.iInitialMercArrivalLocation, TRUE );
|
||||
#endif
|
||||
#endif
|
||||
// Flugente: we might have reloaded the game, so we are currently not dropping mercs out of a helicopter
|
||||
gfIngagedInDrop = FALSE;
|
||||
|
||||
// Start heli Run...
|
||||
StartHelicopterRun();
|
||||
|
||||
|
||||
// Update clock by one so that our DidGameJustStatrt() returns now false for things like LAPTOP, etc...
|
||||
SetGameTimeCompressionLevel( TIME_COMPRESS_X1 );
|
||||
//UpdateClock( 1 );
|
||||
|
||||
Reference in New Issue
Block a user