From 693ed5f03219033c7a45d63939969a18aca72078 Mon Sep 17 00:00:00 2001 From: Steve Date: Tue, 1 May 2018 18:17:16 +0100 Subject: [PATCH 1/3] Exit if we try to load corrupt data (although we shouldn't really get this far). --- src/game/game.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/game/game.c b/src/game/game.c index bb1cac5..a0eecf0 100644 --- a/src/game/game.c +++ b/src/game/game.c @@ -343,7 +343,8 @@ void loadGame(int slot) } else { - printf("Corrupt save file\n"); + SDL_LogMessage(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_ERROR, "Corrupt save file: %s", filename); + exit(1); } free(text); From 7eefeeed863c0ab38c97463dbd85043d1ca9866a Mon Sep 17 00:00:00 2001 From: Steve Date: Fri, 11 May 2018 08:42:04 +0100 Subject: [PATCH 2/3] Set language size to be MAX_DESCRIPTION_LENGTH, not MAX_LINE_LENGTH. --- src/system/i18n.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/system/i18n.c b/src/system/i18n.c index 7f83fc3..861c815 100644 --- a/src/system/i18n.c +++ b/src/system/i18n.c @@ -30,7 +30,7 @@ static HashTable table; void setLanguage(char *applicationName, char *languageCode) { - char language[MAX_LINE_LENGTH], c[MAX_LINE_LENGTH]; + char language[MAX_DESCRIPTION_LENGTH], c[MAX_LINE_LENGTH]; char **key, **value; #ifndef _WIN32 char *lang; @@ -54,7 +54,7 @@ void setLanguage(char *applicationName, char *languageCode) if (c[0] != '\0') { - STRNCPY(language, c, MAX_LINE_LENGTH); + STRNCPY(language, c, MAX_DESCRIPTION_LENGTH); GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SISO3166CTRYNAME, c, MAX_LINE_LENGTH); @@ -68,14 +68,14 @@ void setLanguage(char *applicationName, char *languageCode) #else if ((lang = getenv("LC_ALL")) || (lang = getenv("LC_CTYPE")) || (lang = getenv("LANG"))) { - STRNCPY(language, lang, MAX_LINE_LENGTH); + STRNCPY(language, lang, MAX_DESCRIPTION_LENGTH); } #endif } else { - STRNCPY(language, languageCode, MAX_LINE_LENGTH); + STRNCPY(language, languageCode, MAX_DESCRIPTION_LENGTH); } strtok(language, "."); From 7598af42a05485eae206b1c1ef5356b87953b189 Mon Sep 17 00:00:00 2001 From: Steve Date: Tue, 15 May 2018 07:37:27 +0100 Subject: [PATCH 3/3] GCC compile fix for fadeAmount not being initialized. --- src/world/world.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/world/world.c b/src/world/world.c index 12cb42d..66844ce 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -765,6 +765,8 @@ void drawGameOver(void) { int fadeAmount; + fadeAmount = 0; + if (world.gameOverTimer <= -FPS) { fadeAmount = MIN((world.gameOverTimer + FPS) * -1, 128); @@ -774,7 +776,7 @@ void drawGameOver(void) if (world.gameOverTimer <= -FPS * 2) { - blitRect(atlasTexture->texture, SCREEN_WIDTH / 2, 280, &missionFailed->rect, 1); + blitRect(atlasTexture->texture, SCREEN_WIDTH / 2, 240, &missionFailed->rect, 1); if (world.gameOverTimer <= -FPS * 3) {