Add -assets option to specify data.zip (#139)

This is useful for distributions, which may not want to put data.zip in
the same directory as the binary. This can't be distribution-specific
due to the license ("Altered source/binary versions must be plainly
marked as such, and must not be misrepresented as being the original
software.").
This commit is contained in:
leo60228
2020-02-02 18:28:26 -05:00
committed by GitHub
parent 8260bb2696
commit 45491a03f3
3 changed files with 22 additions and 10 deletions

View File

@@ -44,10 +44,6 @@ entityclass obj;
int main(int argc, char *argv[])
{
if(!FILESYSTEM_init(argv[0]))
{
return 1;
}
SDL_Init(
SDL_INIT_VIDEO |
SDL_INIT_AUDIO |
@@ -55,9 +51,21 @@ int main(int argc, char *argv[])
SDL_INIT_GAMECONTROLLER
);
if (argc > 2 && strcmp(argv[1], "-renderer") == 0)
char* assets = NULL;
for (int i = 1; i < argc; ++i) {
if (strcmp(argv[i], "-renderer") == 0) {
++i;
SDL_SetHintWithPriority(SDL_HINT_RENDER_DRIVER, argv[i], SDL_HINT_OVERRIDE);
} else if (strcmp(argv[i], "-assets") == 0) {
++i;
assets = argv[i];
}
}
if(!FILESYSTEM_init(argv[0], assets))
{
SDL_SetHintWithPriority(SDL_HINT_RENDER_DRIVER, argv[2], SDL_HINT_OVERRIDE);
return 1;
}
NETWORK_init();