mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-21 03:12:41 +01:00
Code Issues Releases Wiki Activity

Codechange: Use StringConsumer for parsing more strings.

Browse Source
This commit is contained in:
frosch
2025-04-29 16:06:48 +02:00
committed by frosch
parent e7d758c82a
commit 79b2202f2e
5 changed files with 84 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/music.cpp
View File

@@ -12,6 +12,7 @@
#include "base_media_func.h"
#include "base_media_music.h"
#include "random_access_file_type.h"
#include "core/string_consumer.hpp"
#include "safeguards.h"
@@ -176,10 +177,13 @@ bool MusicSet::FillSetDetails(const IniFile &ini, const std::string &path, const
item = trimmed_filename != nullptr && timingtrim != nullptr ? timingtrim->GetItem(trimmed_filename) : nullptr;
if (item != nullptr && item->value.has_value() && !item->value->empty()) {
auto endpos = item->value->find(':');
if (endpos != std::string::npos) {
this->songinfo[i].override_start = atoi(item->value->c_str());
this->songinfo[i].override_end = atoi(item->value->c_str() + endpos + 1);
StringConsumer consumer{*item->value};
auto start = consumer.TryReadIntegerBase<uint>(10);
auto valid = consumer.ReadIf(":");
auto end = consumer.TryReadIntegerBase<uint>(10);
if (start.has_value() && valid && end.has_value() && !consumer.AnyBytesLeft()) {
this->songinfo[i].override_start = *start;
this->songinfo[i].override_end = *end;
}
}
}