Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

minor fixes to game launcher header

Browse source
This commit is contained in:
Tim Felgentreff 2022-10-26 21:38:26 +02:00
parent 0d07b5cb4f
commit 2541199a8c
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gameheaders/stratagus-game-launcher.h
View file

@ -269,7 +269,7 @@ int check_version(char* tool_path, char* data_path) {
return 0; return 0;
} }
static void ExtractData(char* extractor_tool, char *const extractor_args[], char* destination, char* scripts_path, int force=0, char* datafileCstr=NULL) { static void ExtractData(char* extractor_tool, const char *const extractor_args[], char* destination, char* scripts_path, int force=0, char* datafileCstr=NULL) {
int canJustReextract; int canJustReextract;
#ifdef EXTRACTION_FILES #ifdef EXTRACTION_FILES
if (force == 0) { if (force == 0) {
@ -305,7 +305,7 @@ static void ExtractData(char* extractor_tool, char *const extractor_args[], char
char* filepatterns[] = { NULL }; char* filepatterns[] = { NULL };
// file types as names not working at least on macOS sierra // file types as names not working at least on macOS sierra
#else #else
char* filepatterns[] = { GAME_CD_FILE_PATTERNS, NULL }; const char* filepatterns[] = { GAME_CD_FILE_PATTERNS, NULL };
int patterncount = 0; int patterncount = 0;
while (filepatterns[patterncount++] != NULL); while (filepatterns[patterncount++] != NULL);
#endif #endif
@ -434,7 +434,7 @@ static void ExtractData(char* extractor_tool, char *const extractor_args[], char
fs::path contrib_dest_path(destination); fs::path contrib_dest_path(destination);
int i = 0; int i = 0;
int optional = 0; int optional = 0;
char* contrib_directories[] = CONTRIB_DIRECTORIES; const char* contrib_directories[] = CONTRIB_DIRECTORIES;
while (contrib_directories[i] != NULL && contrib_directories[i + 1] != NULL) { while (contrib_directories[i] != NULL && contrib_directories[i + 1] != NULL) {
if (!strcmp(contrib_directories[i], ":optional:")) { if (!strcmp(contrib_directories[i], ":optional:")) {
i += 1; i += 1;
@ -666,7 +666,7 @@ int main(int argc, char * argv[]) {
strcpy(stratagus_bin, STRATAGUS_BIN); strcpy(stratagus_bin, STRATAGUS_BIN);
#endif #endif
char *const extractor_args[] = EXTRACTOR_ARGS; const char *const extractor_args[] = EXTRACTOR_ARGS;
if (argc == 2) { if (argc == 2) {
if (stat(argv[1], &st) == 0) { if (stat(argv[1], &st) == 0) {
@ -778,7 +778,7 @@ int main(int argc, char * argv[]) {
stratagus_argv[0] = argv[0]; stratagus_argv[0] = argv[0];
#endif #endif
stratagus_argv[1] = "-d"; stratagus_argv[1] = (char*)"-d";
stratagus_argv[2] = data_path; stratagus_argv[2] = data_path;
for (int i = 3; i < argc + 2; ++i ) { for (int i = 3; i < argc + 2; ++i ) {