1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged from revision: 7525

Browse Source 
- Fixed bug with game selecting helicopter loading screen when reloading game (by anv)
- Fixed autoplace stacks logic from sector inventory on r7380 commit (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7526 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-09-17 18:46:09 +00:00
parent 12cf5396e9
commit 6de39a6ff2
2 changed files with 68 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Loading Screen.cpp
+3 -2
View File
@@ -19,6 +19,7 @@
#include "Strategic Movement.h"
#include "UndergroundInit.h"
#include <string>
#include "strategicmap.h"
extern HVSURFACE ghFrameBuffer;
extern BOOLEAN gfSchedulesHosed;
@@ -358,9 +359,9 @@ void DisplayLoadScreenWithID( UINT8 ubLoadScreenID )
vs_desc.fCreateFlags = VSURFACE_CREATE_FROMFILE | VSURFACE_SYSTEM_MEM_USAGE | VSURFACE_CREATE_FROMPNG_FALLBACK;
szSector = szSectorMap [gWorldSectorY][gWorldSectorX];
const BOOLEAN fExternalLS = (szSector != NULL) && ((DAY <= ubLoadScreenID && ubLoadScreenID <= NIGHT_ALT) || (ubLoadScreenID == UNDERGROUND));
if (fExternalLS)
{
// Get the image path