zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-28 15:02:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

- don't look up a lump name in PathExpander if we are only looking for real files.

Browse source
This commit is contained in:
Christoph Oelckers 2015-12-30 10:21:17 +01:00
parent 1def61e3e3
commit aff42a6186
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/pathexpander.cpp
View file

@ -74,10 +74,10 @@ FileReader *PathExpander::openFileReader(const char *name, int *plumpnum)
current_filename = name; current_filename = name;
FixPathSeperator(current_filename); FixPathSeperator(current_filename);
int lumpnum = Wads.CheckNumForFullName(current_filename);
if (openmode != OM_FILE) if (openmode != OM_FILE)
{ {
int lumpnum = Wads.CheckNumForFullName(current_filename);
if (lumpnum >= 0) if (lumpnum >= 0)
{ {
fp = Wads.ReopenLumpNum(lumpnum); fp = Wads.ReopenLumpNum(lumpnum);

8
src/sound/music_wildmidi_mididevice.cpp
View file

@ -226,7 +226,7 @@ FString WildMIDIDevice::GetStats()
// //
//========================================================================== //==========================================================================
void WildMIDIDevice::WildMidiSetOption(int opt, int set) void WildMIDIDevice::WildMidiSetOption(int opt, int set)
{ {
Renderer->SetOption(opt, set); Renderer->SetOption(opt, set);
} }