diff options
author | aap <aap@papnet.eu> | 2019-06-02 10:31:40 +0200 |
---|---|---|
committer | aap <aap@papnet.eu> | 2019-06-02 10:31:40 +0200 |
commit | cb12ee03ca5fdd2c89be4daf2571736f4363fe95 (patch) | |
tree | cd5fa5516044c50bd777bbf2f513e2d20fa5e990 /src/main.cpp | |
parent | 9c26e46e17b421288f7653f4c9cff81b4b6cdfb0 (diff) |
fixed merge
Diffstat (limited to 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index cd2da378..dd5804d0 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -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; |