From 1ecbeb6bf9d9d23620d392bed22c63fd07bfdbb0 Mon Sep 17 00:00:00 2001 From: Kp Date: Fri, 9 Oct 2015 02:46:11 +0000 Subject: [PATCH] Remove redundant use of PHYSFSX_exists --- similar/main/mission.cpp | 2 -- similar/main/playsave.cpp | 3 --- similar/main/songs.cpp | 5 ++--- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/similar/main/mission.cpp b/similar/main/mission.cpp index 08aec9c29..a00f2ef4d 100644 --- a/similar/main/mission.cpp +++ b/similar/main/mission.cpp @@ -796,8 +796,6 @@ static int load_mission(const mle *mission) #endif { strcpy(buf+strlen(buf)-4,".hog"); //change extension - PHYSFSEXT_locateCorrectCase(buf); - if (PHYSFSX_exists(buf,1)) PHYSFSX_contfile_init(buf, 0); set_briefing_filename(Briefing_text_filename, Current_mission_filename); Ending_text_filename = Briefing_text_filename; diff --git a/similar/main/playsave.cpp b/similar/main/playsave.cpp index 14a89947d..7add2ab49 100644 --- a/similar/main/playsave.cpp +++ b/similar/main/playsave.cpp @@ -1360,9 +1360,6 @@ void read_netgame_profile(netgame_info *ng) char filename[PATH_MAX]; snprintf(filename, sizeof(filename), PLAYER_DIRECTORY_STRING("%.8s.ngp"), static_cast(get_local_player().callsign)); - if (!PHYSFSX_exists(filename,0)) - return; - auto file = PHYSFSX_openReadBuffered(filename); if (!file) return; diff --git a/similar/main/songs.cpp b/similar/main/songs.cpp index 352d91774..ce9fe1971 100644 --- a/similar/main/songs.cpp +++ b/similar/main/songs.cpp @@ -103,9 +103,8 @@ static void songs_init() for (i = SONG_FIRST_LEVEL_SONG; i < predef; i++) { snprintf(BIMSongs[i].filename, sizeof(BIMSongs[i].filename), "game%02d.hmp", i - SONG_FIRST_LEVEL_SONG + 1); - if (!PHYSFSX_exists(BIMSongs[i].filename,1)) - snprintf(BIMSongs[i].filename, sizeof(BIMSongs[i].filename), "game%d.hmp", i - SONG_FIRST_LEVEL_SONG); - if (!PHYSFSX_exists(BIMSongs[i].filename,1)) + if (!PHYSFSX_exists(BIMSongs[i].filename,1) && + !PHYSFSX_exists((snprintf(BIMSongs[i].filename, sizeof(BIMSongs[i].filename), "game%d.hmp", i - SONG_FIRST_LEVEL_SONG), BIMSongs[i].filename), 1)) { memset(BIMSongs[i].filename, '\0', sizeof(BIMSongs[i].filename)); // music not available break;