Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 831 vs 832 for /trunk/Source Code/GUI/GUIConsoleCommandParser.cpp

Diff revisions: vs.
  @@ -145,16 +145,16 @@
145 145 if (soundfile) {
146 146 // Check extensions (not really, musicwav.abc would still be valid, but
147 147 // still ...)
148 - if (!HasExtension(filename, "wav") &&
149 - !HasExtension(filename, "mp3") &&
150 - !HasExtension(filename, "ogg")) {
148 + if (!hasExtension(filename, "wav") &&
149 + !hasExtension(filename, "mp3") &&
150 + !hasExtension(filename, "ogg")) {
151 151 Console::errorfn(Locale::get(_ID("CONSOLE_PLAY_SOUND_INVALID_FORMAT")));
152 152 return;
153 153 }
154 154
155 - std::pair<stringImpl, stringImpl> fileResult = SplitPathToNameAndLocation(filename);
156 - const stringImpl& name = fileResult.first;
157 - const stringImpl& path = fileResult.second;
155 + FileWithPath fileResult = splitPathToNameAndLocation(filename);
156 + const stringImpl& name = fileResult._fileName;
157 + const stringImpl& path = fileResult._path;
158 158
159 159 // The file is valid, so create a descriptor for it
160 160 ResourceDescriptor sound("consoleFilePlayback");