From aea5611e5be5de2faa6bf1573dc1d42db60b7257 Mon Sep 17 00:00:00 2001 From: Misa Date: Mon, 5 Apr 2021 00:48:40 -0700 Subject: [PATCH] Remove default argument from loadFileToMemory() Default function arguments are the devil, and it's better to be more explicit about what you're passing into the function. Also because we might become C-only in the future and to help faciliate that, we should get rid of C++-isms like default function arguments now. --- desktop_version/src/FileSystemUtils.h | 2 +- desktop_version/src/Graphics.cpp | 2 +- desktop_version/src/GraphicsResources.cpp | 2 +- desktop_version/src/Screen.cpp | 2 +- desktop_version/src/SoundSystem.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/desktop_version/src/FileSystemUtils.h b/desktop_version/src/FileSystemUtils.h index 6da59560..0e2fe794 100644 --- a/desktop_version/src/FileSystemUtils.h +++ b/desktop_version/src/FileSystemUtils.h @@ -21,7 +21,7 @@ void FILESYSTEM_unmountAssets(void); bool FILESYSTEM_isAssetMounted(const char* filename); void FILESYSTEM_loadFileToMemory(const char *name, unsigned char **mem, - size_t *len, bool addnull = false); + size_t *len, bool addnull); void FILESYSTEM_freeMemory(unsigned char **mem); bool FILESYSTEM_saveTiXml2Document(const char *name, tinyxml2::XMLDocument& doc); bool FILESYSTEM_loadTiXml2Document(const char *name, tinyxml2::XMLDocument& doc); diff --git a/desktop_version/src/Graphics.cpp b/desktop_version/src/Graphics.cpp index 4d9e4dac..8d6df4d0 100644 --- a/desktop_version/src/Graphics.cpp +++ b/desktop_version/src/Graphics.cpp @@ -364,7 +364,7 @@ void Graphics::Makebfont(void) unsigned char* charmap = NULL; size_t length; - FILESYSTEM_loadFileToMemory("graphics/font.txt", &charmap, &length); + FILESYSTEM_loadFileToMemory("graphics/font.txt", &charmap, &length, false); if (charmap != NULL) { unsigned char* current = charmap; diff --git a/desktop_version/src/GraphicsResources.cpp b/desktop_version/src/GraphicsResources.cpp index 9273fbb6..b338a598 100644 --- a/desktop_version/src/GraphicsResources.cpp +++ b/desktop_version/src/GraphicsResources.cpp @@ -36,7 +36,7 @@ static SDL_Surface* LoadImage(const char *filename, bool noBlend = true, bool no unsigned char *fileIn = NULL; size_t length = 0; - FILESYSTEM_loadFileToMemory(filename, &fileIn, &length); + FILESYSTEM_loadFileToMemory(filename, &fileIn, &length, false); if (noAlpha) { lodepng_decode24(&data, &width, &height, fileIn, length); diff --git a/desktop_version/src/Screen.cpp b/desktop_version/src/Screen.cpp index 9d429a57..f81ede47 100644 --- a/desktop_version/src/Screen.cpp +++ b/desktop_version/src/Screen.cpp @@ -131,7 +131,7 @@ void Screen::LoadIcon(void) size_t length = 0; unsigned char *data; unsigned int width, height; - FILESYSTEM_loadFileToMemory("VVVVVV.png", &fileIn, &length); + FILESYSTEM_loadFileToMemory("VVVVVV.png", &fileIn, &length, false); lodepng_decode24(&data, &width, &height, fileIn, length); FILESYSTEM_freeMemory(&fileIn); SDL_Surface *icon = SDL_CreateRGBSurfaceFrom( diff --git a/desktop_version/src/SoundSystem.cpp b/desktop_version/src/SoundSystem.cpp index 28d065dd..32e7ebf4 100644 --- a/desktop_version/src/SoundSystem.cpp +++ b/desktop_version/src/SoundSystem.cpp @@ -33,7 +33,7 @@ SoundTrack::SoundTrack(const char* fileName) unsigned char *mem; size_t length = 0; - FILESYSTEM_loadFileToMemory(fileName, &mem, &length); + FILESYSTEM_loadFileToMemory(fileName, &mem, &length, false); if (mem == NULL) { fprintf(stderr, "Unable to load WAV file %s\n", fileName);