eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve splash screen handling (#3) 

* Fixes splash screens in Olympus
This commit is contained in:
Alexander Batalov 2022-12-08 16:41:55 +03:00
parent 884034f0bf
commit 8a4ce6c658
1 changed files with 65 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/game.cc
View File

@ -1362,13 +1362,26 @@ static void showSplash()
return; return;
} }
unsigned char* palette = (unsigned char*)internal_malloc(768); unsigned char* palette = reinterpret_cast<unsigned char*>(internal_malloc(768));
if (palette == NULL) { if (palette == NULL) {
fileClose(stream); fileClose(stream);
return; return;
} }
unsigned char* data = (unsigned char*)internal_malloc(SPLASH_WIDTH * SPLASH_HEIGHT); int version;
fileReadInt32(stream, &version);
if (version != 'RIX3') {
fileClose(stream);
return;
}
short width;
fileRead(&width, sizeof(width), 1, stream);
short height;
fileRead(&height, sizeof(height), 1, stream);
unsigned char* data = reinterpret_cast<unsigned char*>(internal_malloc(width * height));
if (data == NULL) { if (data == NULL) {
internal_free(palette); internal_free(palette);
fileClose(stream); fileClose(stream);
@ -1378,14 +1391,59 @@ static void showSplash()
paletteSetEntries(gPaletteBlack); paletteSetEntries(gPaletteBlack);
fileSeek(stream, 10, SEEK_SET); fileSeek(stream, 10, SEEK_SET);
fileRead(palette, 1, 768, stream); fileRead(palette, 1, 768, stream);
fileRead(data, 1, SPLASH_WIDTH * SPLASH_HEIGHT, stream); fileRead(data, 1, width * height, stream);
fileClose(stream); fileClose(stream);
int splashWindowX = (screenGetWidth() - SPLASH_WIDTH) / 2; int size = 0;
int splashWindowY = (screenGetHeight() - SPLASH_HEIGHT) / 2;
_scr_blit(data, SPLASH_WIDTH, SPLASH_HEIGHT, 0, 0, SPLASH_WIDTH, SPLASH_HEIGHT, splashWindowX, splashWindowY); // TODO: Move to settings.
Config config;
if (configInit(&config)) {
if (configRead(&config, "f2_res.ini", false)) {
configGetInt(&config, "STATIC_SCREENS", "SPLASH_SCRN_SIZE", &size);
}
configFree(&config);
}
int screenWidth = screenGetWidth();
int screenHeight = screenGetHeight();
if (size != 0 || screenWidth < width || screenHeight < height) {
int scaledWidth;
int scaledHeight;
if (size == 2) {
scaledWidth = screenWidth;
scaledHeight = screenHeight;
} else {
if (screenHeight * width >= screenWidth * height) {
scaledWidth = screenWidth;
scaledHeight = screenWidth * height / width;
} else {
scaledWidth = screenHeight * width / height;
scaledHeight = screenHeight;
}
}
unsigned char* scaled = reinterpret_cast<unsigned char*>(internal_malloc(scaledWidth * scaledHeight));
if (scaled != NULL) {
blitBufferToBufferStretch(data, width, height, width, scaled, scaledWidth, scaledHeight, scaledWidth);
int x = screenWidth > scaledWidth ? (screenWidth - scaledWidth) / 2 : 0;
int y = screenHeight > scaledHeight ? (screenHeight - scaledHeight) / 2 : 0;
_scr_blit(scaled, scaledWidth, scaledHeight, 0, 0, scaledWidth, scaledHeight, x, y);
paletteFadeTo(palette); paletteFadeTo(palette);
internal_free(scaled);
}
} else {
int x = (screenWidth - width) / 2;
int y = (screenHeight - height) / 2;
_scr_blit(data, width, height, 0, 0, width, height, x, y);
paletteFadeTo(palette);
}
internal_free(data); internal_free(data);
internal_free(palette); internal_free(palette);