fixed merge

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

View file

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