From 83bc8500ee5ca7c3033c4b065d387afa3d80c46a Mon Sep 17 00:00:00 2001 From: Xavier Del Campo Romero Date: Sun, 19 Jan 2025 08:41:06 +0100 Subject: [PATCH] grsound.cpp: Use GfFileExists instead of fopen(3) Opening a file only to check whether it exists is resource-consuming for no reason, since GfFileExists can achieve the same effect without requiring to open a file. --- src/modules/sound/snddefault/grsound.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/modules/sound/snddefault/grsound.cpp b/src/modules/sound/snddefault/grsound.cpp index f32887f25..da72d3b85 100644 --- a/src/modules/sound/snddefault/grsound.cpp +++ b/src/modules/sound/snddefault/grsound.cpp @@ -93,7 +93,6 @@ void grInitSound(tSituation* s, int ncars) tCarElt *car = s->cars[i]; const char* param; char filename[512]; - FILE *file = NULL; // ENGINE PARAMS tdble rpm_scale; @@ -103,17 +102,12 @@ void grInitSound(tSituation* s, int ncars) car->_carName, (int)(sizeof(filename) - strlen(car->_carName) - strlen("cars/models//")), param); - file = fopen(filename, "r"); - if (!file) + if (!GfFileExists(filename)) { sprintf(filename, "data/sound/%.*s", (int)(sizeof(filename) - strlen(car->_carName) - strlen("data/sound/")), param); } - else - { - fclose(file); - } car_sound_data[car->index] = new CarSoundData (car->index, sound_interface); Sound* engine_sound = sound_interface->addSample(filename, ACTIVE_VOLUME | ACTIVE_PITCH | ACTIVE_LP_FILTER, true, false);