mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-12-26 05:15:39 +00:00
Code Issues Projects Releases Wiki Activity

fixed merge

Browse source
This commit is contained in:
aap 2019-06-02 10:31:40 +02:00
parent 9c26e46e17
commit cb12ee03ca
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main.cpp
View file

@ -506,7 +506,7 @@ float NumberOfChunksLoaded;
// TODO: compare with PS2 // TODO: compare with PS2
void void
LoadingScreen(char *str1, char *str2, char *splashscreen) LoadingScreen(const char *str1, const char *str2, const char *splashscreen)
{ {
CSprite2d *splash; CSprite2d *splash;

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

@ -130,12 +130,13 @@ WRAPPER HRESULT _InputInitialise() { EAXJMP(0x5830D0); }
WRAPPER void _InputShutdown() { EAXJMP(0x583910); } WRAPPER void _InputShutdown() { EAXJMP(0x583910); }
WRAPPER HRESULT _InputInitialiseMouse() { EAXJMP(0x583110); } WRAPPER HRESULT _InputInitialiseMouse() { EAXJMP(0x583110); }
WRAPPER void _InputInitialiseJoys() { EAXJMP(0x583580); } WRAPPER void _InputInitialiseJoys() { EAXJMP(0x583580); }
WRAPPER void LoadingScreen(char const *msg1, char const *msg2, char const *screen) { EAXJMP(0x48D770); }
WRAPPER Bool InitialiseGame(void) { EAXJMP(0x48E7E0); } WRAPPER Bool InitialiseGame(void) { EAXJMP(0x48E7E0); }
WRAPPER const Char *GetLevelSplashScreen(Int32 number) { EAXJMP(0x48D750); } WRAPPER const Char *GetLevelSplashScreen(Int32 number) { EAXJMP(0x48D750); }
WRAPPER CSprite2d *LoadSplash(const char *name) { EAXJMP(0x48D550); }
// //
void LoadingScreen(char const *msg1, char const *msg2, char const *screen);
CSprite2d *LoadSplash(const char *name);
void InitialiseLanguage(); void InitialiseLanguage();
RwBool _psSetVideoMode(RwInt32 subSystem, RwInt32 videoMode); RwBool _psSetVideoMode(RwInt32 subSystem, RwInt32 videoMode);
HRESULT CenterVideo(void); HRESULT CenterVideo(void);