From aff42a6186073abf7ebf6abbe73c5ecc18cced07 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 30 Dec 2015 10:21:17 +0100 Subject: [PATCH] - don't look up a lump name in PathExpander if we are only looking for real files. --- src/pathexpander.cpp | 2 +- src/sound/music_wildmidi_mididevice.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pathexpander.cpp b/src/pathexpander.cpp index d8b912b65..bb89a0555 100644 --- a/src/pathexpander.cpp +++ b/src/pathexpander.cpp @@ -74,10 +74,10 @@ FileReader *PathExpander::openFileReader(const char *name, int *plumpnum) current_filename = name; FixPathSeperator(current_filename); - int lumpnum = Wads.CheckNumForFullName(current_filename); if (openmode != OM_FILE) { + int lumpnum = Wads.CheckNumForFullName(current_filename); if (lumpnum >= 0) { fp = Wads.ReopenLumpNum(lumpnum); diff --git a/src/sound/music_wildmidi_mididevice.cpp b/src/sound/music_wildmidi_mididevice.cpp index 80bf46e2b..332a97abe 100644 --- a/src/sound/music_wildmidi_mididevice.cpp +++ b/src/sound/music_wildmidi_mididevice.cpp @@ -226,7 +226,7 @@ FString WildMIDIDevice::GetStats() // //========================================================================== -void WildMIDIDevice::WildMidiSetOption(int opt, int set) -{ - Renderer->SetOption(opt, set); -} +void WildMIDIDevice::WildMidiSetOption(int opt, int set) +{ + Renderer->SetOption(opt, set); +}