dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: use std::string for base media filename/warning storage

Browse Source
This commit is contained in:
Rubidium
2023-04-18 22:21:17 +02:00
committed by rubidium42
parent b8f0513a72
commit 43c65a3fec
8 changed files with 39 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/music/midifile.cpp
View File

@@ -849,7 +849,7 @@ bool MidiFile::LoadSong(const MusicSongInfo &song)
{
switch (song.filetype) {
case MTT_STANDARDMIDI:
return this->LoadFile(song.filename);
return this->LoadFile(song.filename.c_str());
case MTT_MPSMIDI:
{
size_t songdatalen = 0;
@@ -1060,9 +1060,9 @@ std::string MidiFile::GetSMFFile(const MusicSongInfo &song)
char basename[MAX_PATH];
{
const char *fnstart = strrchr(song.filename, PATHSEPCHAR);
const char *fnstart = strrchr(song.filename.c_str(), PATHSEPCHAR);
if (fnstart == nullptr) {
fnstart = song.filename;
fnstart = song.filename.c_str();
} else {
fnstart++;
}