Files
@ r26913:e7b3d514fe34
Branch filter:
Location: cpp/openttd-patchpack/source/src/music.cpp - annotation
r26913:e7b3d514fe34
7.1 KiB
text/x-c
Revert 92c7551: Line drawing algorithm fix broke other cases (#10497)
This reverts commit 92c755161d6a467d33477bd0041fc720d7d9ba41.
This reverts commit 92c755161d6a467d33477bd0041fc720d7d9ba41.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 | r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r9111:983de9c5a848 r6201:2e76eb9a1d7a r8812:554e8dcfb34c r14055:e4168a875df8 r22884:72bcc81ae179 r17629:21e9dfd343cd r14055:e4168a875df8 r14055:e4168a875df8 r14055:e4168a875df8 r21383:942c32fb8b0e r25412:5bdd49f35d4e r22884:72bcc81ae179 r22884:72bcc81ae179 r22884:72bcc81ae179 r22884:72bcc81ae179 r22884:72bcc81ae179 r22884:72bcc81ae179 r22884:72bcc81ae179 r23607:36c15679007d r22884:72bcc81ae179 r22884:72bcc81ae179 r22884:72bcc81ae179 r23607:36c15679007d r22884:72bcc81ae179 r25412:5bdd49f35d4e r25412:5bdd49f35d4e r22884:72bcc81ae179 r22884:72bcc81ae179 r25412:5bdd49f35d4e r25412:5bdd49f35d4e r25412:5bdd49f35d4e r22884:72bcc81ae179 r25412:5bdd49f35d4e r22884:72bcc81ae179 r22884:72bcc81ae179 r22884:72bcc81ae179 r23607:36c15679007d r22884:72bcc81ae179 r22884:72bcc81ae179 r22884:72bcc81ae179 r22884:72bcc81ae179 r22884:72bcc81ae179 r22884:72bcc81ae179 r22884:72bcc81ae179 r22884:72bcc81ae179 r23607:36c15679007d r22884:72bcc81ae179 r22884:72bcc81ae179 r22884:72bcc81ae179 r22884:72bcc81ae179 r23607:36c15679007d r22884:72bcc81ae179 r25412:5bdd49f35d4e r25412:5bdd49f35d4e r22884:72bcc81ae179 r22884:72bcc81ae179 r25412:5bdd49f35d4e r25412:5bdd49f35d4e r25412:5bdd49f35d4e r25412:5bdd49f35d4e r25412:5bdd49f35d4e r22884:72bcc81ae179 r25412:5bdd49f35d4e r22884:72bcc81ae179 r22884:72bcc81ae179 r23607:36c15679007d r22884:72bcc81ae179 r21383:942c32fb8b0e r14055:e4168a875df8 r14055:e4168a875df8 r14055:e4168a875df8 r14055:e4168a875df8 r14055:e4168a875df8 r14055:e4168a875df8 r14055:e4168a875df8 r14055:e4168a875df8 r14055:e4168a875df8 r17629:21e9dfd343cd r24521:57ec498b9221 r14055:e4168a875df8 r18368:c399e53439ff r18368:c399e53439ff r14055:e4168a875df8 r14055:e4168a875df8 r14055:e4168a875df8 r14055:e4168a875df8 r14055:e4168a875df8 r14055:e4168a875df8 r14055:e4168a875df8 r14055:e4168a875df8 r14055:e4168a875df8 r14055:e4168a875df8 r23607:36c15679007d r14055:e4168a875df8 r23607:36c15679007d r23607:36c15679007d r14057:f1009df0b28b r14057:f1009df0b28b r23607:36c15679007d r14619:fff04644c054 r14055:e4168a875df8 r14055:e4168a875df8 r14055:e4168a875df8 r14055:e4168a875df8 r14055:e4168a875df8 r14055:e4168a875df8 r5584:545d748cc681 r14055:e4168a875df8 r23607:36c15679007d r14055:e4168a875df8 r14055:e4168a875df8 r15044:862b76e20a87 r14055:e4168a875df8 r18368:c399e53439ff r14055:e4168a875df8 r14055:e4168a875df8 r14055:e4168a875df8 r22884:72bcc81ae179 r22909:ccc8d6c236f0 r22926:82779a967ee2 r22926:82779a967ee2 r14055:e4168a875df8 r23607:36c15679007d r22883:e713e5b73adc r14055:e4168a875df8 r14055:e4168a875df8 r14055:e4168a875df8 r22883:e713e5b73adc r22883:e713e5b73adc r22884:72bcc81ae179 r24216:bee2183ce93e r22884:72bcc81ae179 r22884:72bcc81ae179 r24216:bee2183ce93e r22884:72bcc81ae179 r23607:36c15679007d r25655:1030dcb7eb52 r22912:55c82c991a10 r22912:55c82c991a10 r22884:72bcc81ae179 r22884:72bcc81ae179 r22884:72bcc81ae179 r22884:72bcc81ae179 r22884:72bcc81ae179 r22884:72bcc81ae179 r22884:72bcc81ae179 r22909:ccc8d6c236f0 r14632:2ebcc5e64329 r14632:2ebcc5e64329 r14632:2ebcc5e64329 r23607:36c15679007d r14632:2ebcc5e64329 r14632:2ebcc5e64329 r22909:ccc8d6c236f0 r14632:2ebcc5e64329 r22909:ccc8d6c236f0 r24216:bee2183ce93e r14632:2ebcc5e64329 r14632:2ebcc5e64329 r22884:72bcc81ae179 r24216:bee2183ce93e r24216:bee2183ce93e r22884:72bcc81ae179 r25655:1030dcb7eb52 r22884:72bcc81ae179 r22884:72bcc81ae179 r14055:e4168a875df8 r22884:72bcc81ae179 r14055:e4168a875df8 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22909:ccc8d6c236f0 r24216:bee2183ce93e r24216:bee2183ce93e r24216:bee2183ce93e r24216:bee2183ce93e r24216:bee2183ce93e r24216:bee2183ce93e r22909:ccc8d6c236f0 r22909:ccc8d6c236f0 r14055:e4168a875df8 r14055:e4168a875df8 r15044:862b76e20a87 r14055:e4168a875df8 | /*
* This file is part of OpenTTD.
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file music.cpp The songs that OpenTTD knows. */
#include "stdafx.h"
/** The type of set we're replacing */
#define SET_TYPE "music"
#include "base_media_func.h"
#include "safeguards.h"
#include "random_access_file_type.h"
/**
* Read the name of a music CAT file entry.
* @param filename Name of CAT file to read from
* @param entrynum Index of entry whose name to read
* @return Pointer to string, caller is responsible for freeing memory,
* nullptr if entrynum does not exist.
*/
char *GetMusicCatEntryName(const char *filename, size_t entrynum)
{
if (!FioCheckFileExists(filename, BASESET_DIR)) return nullptr;
RandomAccessFile file(filename, BASESET_DIR);
uint32 ofs = file.ReadDword();
size_t entry_count = ofs / 8;
if (entrynum < entry_count) {
file.SeekTo(entrynum * 8, SEEK_SET);
file.SeekTo(file.ReadDword(), SEEK_SET);
byte namelen = file.ReadByte();
char *name = MallocT<char>(namelen + 1);
file.ReadBlock(name, namelen);
name[namelen] = '\0';
return name;
}
return nullptr;
}
/**
* Read the full data of a music CAT file entry.
* @param filename Name of CAT file to read from.
* @param entrynum Index of entry to read
* @param[out] entrylen Receives length of data read
* @return Pointer to buffer with data read, caller is responsible for freeind memory,
* nullptr if entrynum does not exist.
*/
byte *GetMusicCatEntryData(const char *filename, size_t entrynum, size_t &entrylen)
{
entrylen = 0;
if (!FioCheckFileExists(filename, BASESET_DIR)) return nullptr;
RandomAccessFile file(filename, BASESET_DIR);
uint32 ofs = file.ReadDword();
size_t entry_count = ofs / 8;
if (entrynum < entry_count) {
file.SeekTo(entrynum * 8, SEEK_SET);
size_t entrypos = file.ReadDword();
entrylen = file.ReadDword();
file.SeekTo(entrypos, SEEK_SET);
file.SkipBytes(file.ReadByte());
byte *data = MallocT<byte>(entrylen);
file.ReadBlock(data, entrylen);
return data;
}
return nullptr;
}
INSTANTIATE_BASE_MEDIA_METHODS(BaseMedia<MusicSet>, MusicSet)
/** Names corresponding to the music set's files */
static const char * const _music_file_names[] = {
"theme",
"old_0", "old_1", "old_2", "old_3", "old_4", "old_5", "old_6", "old_7", "old_8", "old_9",
"new_0", "new_1", "new_2", "new_3", "new_4", "new_5", "new_6", "new_7", "new_8", "new_9",
"ezy_0", "ezy_1", "ezy_2", "ezy_3", "ezy_4", "ezy_5", "ezy_6", "ezy_7", "ezy_8", "ezy_9",
};
/** Make sure we aren't messing things up. */
static_assert(lengthof(_music_file_names) == NUM_SONGS_AVAILABLE);
template <class T, size_t Tnum_files, bool Tsearch_in_tars>
/* static */ const char * const *BaseSet<T, Tnum_files, Tsearch_in_tars>::file_names = _music_file_names;
template <class Tbase_set>
/* static */ const char *BaseMedia<Tbase_set>::GetExtension()
{
return ".obm"; // OpenTTD Base Music
}
template <class Tbase_set>
/* static */ bool BaseMedia<Tbase_set>::DetermineBestSet()
{
if (BaseMedia<Tbase_set>::used_set != nullptr) return true;
const Tbase_set *best = nullptr;
for (const Tbase_set *c = BaseMedia<Tbase_set>::available_sets; c != nullptr; c = c->next) {
if (c->GetNumMissing() != 0) continue;
if (best == nullptr ||
(best->fallback && !c->fallback) ||
best->valid_files < c->valid_files ||
(best->valid_files == c->valid_files &&
(best->shortname == c->shortname && best->version < c->version))) {
best = c;
}
}
BaseMedia<Tbase_set>::used_set = best;
return BaseMedia<Tbase_set>::used_set != nullptr;
}
bool MusicSet::FillSetDetails(IniFile *ini, const char *path, const char *full_filename)
{
bool ret = this->BaseSet<MusicSet, NUM_SONGS_AVAILABLE, false>::FillSetDetails(ini, path, full_filename);
if (ret) {
this->num_available = 0;
IniGroup *names = ini->GetGroup("names");
IniGroup *catindex = ini->GetGroup("catindex");
IniGroup *timingtrim = ini->GetGroup("timingtrim");
uint tracknr = 1;
for (uint i = 0; i < lengthof(this->songinfo); i++) {
const char *filename = this->files[i].filename;
if (names == nullptr || StrEmpty(filename) || this->files[i].check_result == MD5File::CR_NO_FILE) {
this->songinfo[i].songname[0] = '\0';
continue;
}
this->songinfo[i].filename = filename; // non-owned pointer
IniItem *item = catindex->GetItem(_music_file_names[i], false);
if (item != nullptr && item->value.has_value() && !item->value->empty()) {
/* Song has a CAT file index, assume it's MPS MIDI format */
this->songinfo[i].filetype = MTT_MPSMIDI;
this->songinfo[i].cat_index = atoi(item->value->c_str());
char *songname = GetMusicCatEntryName(filename, this->songinfo[i].cat_index);
if (songname == nullptr) {
Debug(grf, 0, "Base music set song missing from CAT file: {}/{}", filename, this->songinfo[i].cat_index);
this->songinfo[i].songname[0] = '\0';
continue;
}
strecpy(this->songinfo[i].songname, songname, lastof(this->songinfo[i].songname));
free(songname);
} else {
this->songinfo[i].filetype = MTT_STANDARDMIDI;
}
const char *trimmed_filename = filename;
/* As we possibly add a path to the filename and we compare
* on the filename with the path as in the .obm, we need to
* keep stripping path elements until we find a match. */
for (; trimmed_filename != nullptr; trimmed_filename = strchr(trimmed_filename, PATHSEPCHAR)) {
/* Remove possible double path separator characters from
* the beginning, so we don't start reading e.g. root. */
while (*trimmed_filename == PATHSEPCHAR) trimmed_filename++;
item = names->GetItem(trimmed_filename, false);
if (item != nullptr && item->value.has_value() && !item->value->empty()) break;
}
if (this->songinfo[i].filetype == MTT_STANDARDMIDI) {
if (item != nullptr && item->value.has_value() && !item->value->empty()) {
strecpy(this->songinfo[i].songname, item->value->c_str(), lastof(this->songinfo[i].songname));
} else {
Debug(grf, 0, "Base music set song name missing: {}", filename);
return false;
}
}
this->num_available++;
/* Number the theme song (if any) track 0, rest are normal */
if (i == 0) {
this->songinfo[i].tracknr = 0;
} else {
this->songinfo[i].tracknr = tracknr++;
}
item = trimmed_filename != nullptr ? timingtrim->GetItem(trimmed_filename, false) : 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);
}
}
}
}
return ret;
}
|