a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-11-06 03:25:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #975 from aap/lcs

Browse source 
loadscreens, not accurate
This commit is contained in:
aap 2021-01-22 00:59:13 +01:00 committed by GitHub
parent 035d655e47 f7ab5cb7c4
commit de10f0dda6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 35 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/Frontend.cpp
View file

@ -5574,7 +5574,7 @@ CMenuManager::DrawQuitGameScreen(void)
static CSprite2d *splash = nil; static CSprite2d *splash = nil;
if (splash == nil) if (splash == nil)
splash = LoadSplash("OUTRO"); splash = LoadSplash("sceelee");
m_aFrontEndSprites[MENUSPRITE_VCLOGO].Draw(CRect(MENU_X(28.0f), MENU_Y(8.0f), MENU_X(157.0f), MENU_Y(138.0f)), CRGBA(255, 255, 255, -(m_nMenuFadeAlpha + 1))); m_aFrontEndSprites[MENUSPRITE_VCLOGO].Draw(CRect(MENU_X(28.0f), MENU_Y(8.0f), MENU_X(157.0f), MENU_Y(138.0f)), CRGBA(255, 255, 255, -(m_nMenuFadeAlpha + 1)));

48
src/core/main.cpp
View file

@ -101,7 +101,7 @@ RwRGBA gColourTop;
bool gameAlreadyInitialised; bool gameAlreadyInitialised;
float NumberOfChunksLoaded; float NumberOfChunksLoaded;
#define TOTALNUMCHUNKS 95.0f #define TOTALNUMCHUNKS 52.0f
bool g_SlowMode = false; bool g_SlowMode = false;
char version_name[64]; char version_name[64];
@ -572,11 +572,11 @@ GetRandomSplashScreen(void)
static char splashName[128]; static char splashName[128];
static int splashIndex[12] = { static int splashIndex[12] = {
1, 2, 1, 2,
3, 4, 3, 0,
5, 11, 1, 2,
6, 8, 3, 0,
9, 10, 1, 2,
7, 12 3, 0
}; };
index = splashIndex[2*index2 + CGeneral::GetRandomNumberInRange(0, 2)]; index = splashIndex[2*index2 + CGeneral::GetRandomNumberInRange(0, 2)];
@ -590,11 +590,12 @@ GetRandomSplashScreen(void)
Const char* Const char*
GetLevelSplashScreen(int level) GetLevelSplashScreen(int level)
{ {
static Const char *splashScreens[4] = { static Const char *splashScreens[5] = {
nil, nil,
"splash1", "splash1",
"splash2", "splash2",
"splash3", "splash3",
"loadsc0",
}; };
return splashScreens[level]; return splashScreens[level];
@ -606,7 +607,7 @@ ResetLoadingScreenBar()
NumberOfChunksLoaded = 0.0f; NumberOfChunksLoaded = 0.0f;
} }
//--MIAMI: done //--LCS: not the real thing
void void
LoadingScreen(const char *str1, const char *str2, const char *splashscreen) LoadingScreen(const char *str1, const char *str2, const char *splashscreen)
{ {
@ -618,7 +619,7 @@ LoadingScreen(const char *str1, const char *str2, const char *splashscreen)
#endif #endif
#ifndef RANDOMSPLASH #ifndef RANDOMSPLASH
splashscreen = "LOADSC0"; splashscreen = "SCEELEE";
#endif #endif
splash = LoadSplash(splashscreen); splash = LoadSplash(splashscreen);
@ -640,24 +641,27 @@ LoadingScreen(const char *str1, const char *str2, const char *splashscreen)
NumberOfChunksLoaded += 1; NumberOfChunksLoaded += 1;
#ifndef RANDOMSPLASH #ifndef RANDOMSPLASH
// this looks nice
float hpos = SCREEN_SCALE_X(40); float hpos = SCREEN_SCALE_X(40);
float length = SCREEN_WIDTH - SCREEN_SCALE_X(80); float length = SCREEN_WIDTH - SCREEN_SCALE_X(80);
float top = SCREEN_HEIGHT - SCREEN_SCALE_Y(14); float top = SCREEN_HEIGHT - SCREEN_SCALE_Y(30);
float bottom = top + SCREEN_SCALE_Y(5); float bottom = top + SCREEN_SCALE_Y(8);
#else #else
float hpos = SCREEN_STRETCH_X(40); // should correspond to PS2 position
float length = SCREEN_STRETCH_X(440); float hpos = SCREEN_STRETCH_X(44);
// this is rather weird float length = SCREEN_STRETCH_X(176);
float top = SCREEN_STRETCH_Y(407.4f - 7.0f/3.0f); float top = SCREEN_STRETCH_Y(420);
float bottom = SCREEN_STRETCH_Y(407.4f + 7.0f/3.0f); float bottom = top + SCREEN_STRETCH_Y(8);
#endif #endif
CSprite2d::DrawRect(CRect(hpos-1.0f, top-1.0f, hpos+length+1.0f, bottom+1.0f), CRGBA(40, 53, 68, 255)); CSprite2d::DrawRect(CRect(hpos+4.0f, top+6.0f, hpos+length+4.0f, bottom+6.0f), CRGBA(0, 0, 0, 200));
CSprite2d::DrawRect(CRect(hpos, top, hpos+length, bottom), CRGBA(155, 50, 125, 255)); CSprite2d::DrawRect(CRect(hpos, top, hpos+length, bottom), CRGBA(0, 0, 0, 255));
CSprite2d::DrawRect(CRect(hpos+1.0f, top+1.0f, hpos+length-1.0f, bottom-1.0f), CRGBA(99, 99, 99, 255));
length *= NumberOfChunksLoaded/TOTALNUMCHUNKS; length *= NumberOfChunksLoaded/TOTALNUMCHUNKS;
CSprite2d::DrawRect(CRect(hpos, top, hpos+length, bottom), CRGBA(255, 150, 225, 255)); CSprite2d::DrawRect(CRect(hpos+1.0f, top+1.0f, hpos+length-1.0f, bottom-1.0f), CRGBA(126, 15, 0, 255));
// this is done by the game but is unused // this is done by the game but is unused
CFont::SetBackgroundOff(); CFont::SetBackgroundOff();
@ -672,7 +676,7 @@ LoadingScreen(const char *str1, const char *str2, const char *splashscreen)
// my attempt // my attempt
static wchar tmpstr[80]; static wchar tmpstr[80];
float yscale = SCREEN_SCALE_Y(0.9f); float yscale = SCREEN_SCALE_Y(0.9f);
top -= 45*yscale; top = bottom+5*yscale;
CFont::SetScale(SCREEN_SCALE_X(0.75f), yscale); CFont::SetScale(SCREEN_SCALE_X(0.75f), yscale);
CFont::SetPropOn(); CFont::SetPropOn();
CFont::SetRightJustifyOff(); CFont::SetRightJustifyOff();
@ -693,13 +697,13 @@ LoadingScreen(const char *str1, const char *str2, const char *splashscreen)
} }
} }
//--MIAMI: done //--LCS: slightly fixed
void void
LoadingIslandScreen(const char *levelName) LoadingIslandScreen(const char *levelName)
{ {
CSprite2d *splash; CSprite2d *splash;
splash = LoadSplash(nil); splash = LoadSplash(GetLevelSplashScreen(CGame::currLevel));
if(!DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255)) if(!DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255))
return; return;

8
src/skel/glfw/glfw.cpp
View file

@ -1823,8 +1823,8 @@ main(int argc, char *argv[])
printf("Into TheGame!!!\n"); printf("Into TheGame!!!\n");
#else #else
LoadingScreen(nil, nil, "loadsc0"); LoadingScreen(nil, nil, "sceelee");
// LoadingScreen(nil, nil, "loadsc0"); // duplicate // LoadingScreen(nil, nil, "sceelee"); // duplicate
#endif #endif
if ( !CGame::InitialiseOnceAfterRW() ) if ( !CGame::InitialiseOnceAfterRW() )
RsGlobal.quit = TRUE; RsGlobal.quit = TRUE;
@ -1840,8 +1840,8 @@ main(int argc, char *argv[])
#ifndef PS2_MENU #ifndef PS2_MENU
case GS_INIT_FRONTEND: case GS_INIT_FRONTEND:
{ {
LoadingScreen(nil, nil, "loadsc0"); LoadingScreen(nil, nil, "sceelee");
// LoadingScreen(nil, nil, "loadsc0"); // duplicate // LoadingScreen(nil, nil, "sceelee"); // duplicate
FrontEndMenuManager.m_bGameNotLoaded = true; FrontEndMenuManager.m_bGameNotLoaded = true;

8
src/skel/win/win.cpp
View file

@ -2347,8 +2347,8 @@ WinMain(HINSTANCE instance,
printf("Into TheGame!!!\n"); printf("Into TheGame!!!\n");
#else #else
LoadingScreen(nil, nil, "loadsc0"); LoadingScreen(nil, nil, "sceelee");
// LoadingScreen(nil, nil, "loadsc0"); // duplicate // LoadingScreen(nil, nil, "sceelee"); // duplicate
#endif #endif
if ( !CGame::InitialiseOnceAfterRW() ) if ( !CGame::InitialiseOnceAfterRW() )
RsGlobal.quit = TRUE; RsGlobal.quit = TRUE;
@ -2365,8 +2365,8 @@ WinMain(HINSTANCE instance,
#ifndef PS2_MENU #ifndef PS2_MENU
case GS_INIT_FRONTEND: case GS_INIT_FRONTEND:
{ {
LoadingScreen(nil, nil, "loadsc0"); LoadingScreen(nil, nil, "sceelee");
// LoadingScreen(nil, nil, "loadsc0"); // duplicate // LoadingScreen(nil, nil, "sceelee"); // duplicate
FrontEndMenuManager.m_bGameNotLoaded = true; FrontEndMenuManager.m_bGameNotLoaded = true;