miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.11.0-beta1

Browse Source
This commit is contained in:
dP
2021-01-23 17:31:11 +03:00
parent d3c06c25c8
commit 5e4506f493
1045 changed files with 23534 additions and 60345 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/music_gui.cpp
+6 -9
View File
@@ -65,7 +65,7 @@ struct MusicSystem {
void BuildPlaylists();
void ChangePlaylist(PlaylistChoices pl);
void ChangeMusicSet(const char *set_name);
void ChangeMusicSet(const std::string &set_name);
void Shuffle();
void Unshuffle();
@@ -167,12 +167,10 @@ void MusicSystem::ChangePlaylist(PlaylistChoices pl)
* Change to named music set, and reset playback.
* @param set_name Name of music set to select
*/
void MusicSystem::ChangeMusicSet(const char *set_name)
void MusicSystem::ChangeMusicSet(const std::string &set_name)
{
BaseMusic::SetSet(set_name);
free(BaseMusic::ini_set);
BaseMusic::ini_set = stredup(set_name);
BaseMusic::ini_set = set_name;
this->BuildPlaylists();
this->ChangePlaylist(this->selected_playlist);
@@ -433,8 +431,7 @@ void MusicLoop()
void ChangeMusicSet(int index)
{
if (BaseMusic::GetIndexOfUsedSet() == index) return;
const char *name = BaseMusic::GetSet(index)->name;
_music.ChangeMusicSet(name);
_music.ChangeMusicSet(BaseMusic::GetSet(index)->name);
}
/**
@@ -464,7 +461,7 @@ struct MusicTrackSelectionWindow : public Window {
SetDParam(0, STR_MUSIC_PLAYLIST_ALL + _settings_client.music.playlist);
break;
case WID_MTS_CAPTION:
SetDParamStr(0, BaseMusic::GetUsedSet()->name);
SetDParamStr(0, BaseMusic::GetUsedSet()->name.c_str());
break;
}
}
@@ -508,7 +505,7 @@ struct MusicTrackSelectionWindow : public Window {
SetDParam(1, 2);
SetDParamStr(2, song->songname);
Dimension d2 = GetStringBoundingBox(STR_PLAYLIST_TRACK_NAME);
d.width = max(d.width, d2.width);
d.width = std::max(d.width, d2.width);
d.height += d2.height;
}
d.width += padding.width;