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

- reverted some files from build 924

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@927 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2007-06-09 21:38:54 +00:00
parent 1c1f843449
commit 536f4ca51b
2 changed files with 926 additions and 1603 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Loading Screen.cpp
+126
View File
@@ -578,13 +578,138 @@ void DisplayLoadScreenWithID( UINT8 ubLoadScreenID )
HVSURFACE hVSurface;
UINT32 uiLoadScreen;
STRING512 smallImage;
BOOLEAN fExternalLS = FALSE;
bShowSmallImage = FALSE;
vs_desc.fCreateFlags = VSURFACE_CREATE_FROMFILE | VSURFACE_SYSTEM_MEM_USAGE;
if (gGameExternalOptions.gfUseExternalLoadscreens)
{
if ((ubLoadScreenID == HELI || ubLoadScreenID == DAY || ubLoadScreenID == DAY_ALT ||
ubLoadScreenID == NIGHT || ubLoadScreenID == NIGHT_ALT) && szSector != NULL)
{
fExternalLS = TRUE;
}
else
{
fExternalLS = FALSE;
}
}
else
{
if ((ubLoadScreenID == HELI || ubLoadScreenID == DAY || ubLoadScreenID == DAY_ALT ||
ubLoadScreenID == NIGHT || ubLoadScreenID == NIGHT_ALT) && szSector != NULL)
{
fExternalLS = TRUE;
}
else
{
fExternalLS = FALSE;
}
}
if (fExternalLS)
{
// Get the image path
char szImagePath[80];
char szImageFormat[5];
char szFullImagePath[80];
// Start screen
if (ubLoadScreenID == HELI)
{
strncpy(szImagePath, gSectorLoadscreens[0].szDay, 80);
strncpy(szImageFormat, ".", MAX_IMAGE_FORMAT_CHARS);
strcat(szImageFormat, gSectorLoadscreens[0].szImageFormat);
}
else
{
for (int i = 1; i < MAX_SECTOR_LOADSCREENS; i++)
{
// We found the sector
if (strcmp(gSectorLoadscreens[i].szLocation, szSector) == 0)
{
strncpy(szImageFormat, ".", MAX_IMAGE_FORMAT_CHARS);
strcat(szImageFormat, gSectorLoadscreens[i].szImageFormat);
BOOLEAN fAlternate = gSectorLoadscreens[i].RandomAltSector;
if (fAlternate)
{
// Day
if (ubLoadScreenID == DAY)
{
if( Random( 2 ) )
{
ubLoadScreenID = DAY;
}
else
{
ubLoadScreenID = DAY_ALT;
}
}
// Night
else
{
if( Random( 2 ) )
{
ubLoadScreenID = NIGHT;
}
else
{
ubLoadScreenID = NIGHT_ALT;
}
}
}
switch (ubLoadScreenID)
{
case DAY:
strncpy(szImagePath, gSectorLoadscreens[i].szDay, MAX_IMAGE_PATH_CHARS);
break;
case DAY_ALT:
strncpy(szImagePath, gSectorLoadscreens[i].szDayAlt, MAX_IMAGE_PATH_CHARS);
break;
case NIGHT:
strncpy(szImagePath, gSectorLoadscreens[i].szNight, MAX_IMAGE_PATH_CHARS);
break;
case NIGHT_ALT:
strncpy(szImagePath, gSectorLoadscreens[i].szNightAlt, MAX_IMAGE_PATH_CHARS);
break;
}
break;
}
}
}
// Small image: 640x480
strncpy(szFullImagePath, szImagePath, 80);
strcat(szFullImagePath, szImageFormat);
strcpy(smallImage,szFullImagePath);
// Actual image, depending on the resolution
if (iResolution == 1)
{
strncpy(szFullImagePath, szImagePath, 80);
strcat(szFullImagePath, "_800x600");
strcat(szFullImagePath, szImageFormat);
}
else if (iResolution == 2)
{
strncpy(szFullImagePath, szImagePath, 80);
strcat(szFullImagePath, "_1024x768");
strcat(szFullImagePath, szImageFormat);
}
strcpy(vs_desc.ImageFile,szFullImagePath);
}
else
{
switch( ubLoadScreenID )
{
case LOADINGSCREEN_NOTHING:
strcpy(smallImage, "LOADSCREENS\\LS_Heli.sti");
if (iResolution == 0)
@@ -1284,6 +1409,7 @@ void DisplayLoadScreenWithID( UINT8 ubLoadScreenID )
strcpy(vs_desc.ImageFile, "LOADSCREENS\\LS_Heli_1024x768.sti");
}
break;
} // Switch - END
}
// Sti loadscreen (big image) is not available