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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
dP
2025-06-14 17:01:17 +05:00
parent 94b65d0562 f388ddce1f
commit f0f93c68ca
1132 changed files with 59429 additions and 52888 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/survey.cpp
+13 -13
View File
@@ -32,6 +32,9 @@
#include "video/video_driver.hpp"
#include "base_media_base.h"
#include "base_media_graphics.h"
#include "base_media_music.h"
#include "base_media_sounds.h"
#include "blitter/factory.hpp"
#include "social_integration.h"
@@ -65,9 +68,9 @@
#ifdef WITH_LZO
#include <lzo/lzo1x.h>
#endif
#if defined(WITH_SDL) || defined(WITH_SDL2)
# include <SDL.h>
#endif /* WITH_SDL || WITH_SDL2 */
#ifdef WITH_SDL2
#include <SDL.h>
#endif /* WITH_SDL2 */
#ifdef WITH_ZLIB
# include <zlib.h>
#endif
@@ -150,7 +153,7 @@ static void SurveySettingsTable(nlohmann::json &survey, const SettingTable &tabl
/* Skip any old settings we no longer save/load. */
if (!SlIsObjectCurrentlyValid(sd->save.version_from, sd->save.version_to)) continue;
auto name = sd->GetName();
const auto &name = sd->GetName();
if (skip_if_default && sd->IsDefaultValue(object)) continue;
survey[name] = sd->FormatValue(object);
}
@@ -313,7 +316,7 @@ void SurveyFont(nlohmann::json &survey)
void SurveyCompanies(nlohmann::json &survey)
{
for (const Company *c : Company::Iterate()) {
auto &company = survey[std::to_string(c->index)];
auto &company = survey[std::to_string(c->index.base())];
if (c->ai_info == nullptr) {
company["type"] = "human";
} else {
@@ -359,9 +362,9 @@ void SurveyTimers(nlohmann::json &survey)
*/
void SurveyGrfs(nlohmann::json &survey)
{
for (GRFConfig *c = _grfconfig; c != nullptr; c = c->next) {
auto grfid = fmt::format("{:08x}", BSWAP32(c->ident.grfid));
auto &grf = survey[grfid];
for (const auto &c : _grfconfig) {
auto grfid = fmt::format("{:08x}", std::byteswap(c->ident.grfid));
auto &grf = survey[std::move(grfid)];
grf["md5sum"] = FormatArrayAsHex(c->ident.md5sum);
grf["status"] = c->status;
@@ -374,7 +377,7 @@ void SurveyGrfs(nlohmann::json &survey)
if ((c->palette & GRFP_BLT_MASK) == GRFP_BLT_UNSET) grf["blitter"] = "unset";
if ((c->palette & GRFP_BLT_MASK) == GRFP_BLT_32BPP) grf["blitter"] = "32bpp";
grf["is_static"] = HasBit(c->flags, GCF_STATIC);
grf["is_static"] = c->flags.Test(GRFConfigFlag::Static);
grf["parameters"] = std::span<const uint32_t>(c->param);
}
}
@@ -441,10 +444,7 @@ void SurveyLibraries(nlohmann::json &survey)
survey["png"] = png_get_libpng_ver(nullptr);
#endif /* WITH_PNG */
#ifdef WITH_SDL
const SDL_version *sdl_v = SDL_Linked_Version();
survey["sdl"] = fmt::format("{}.{}.{}", sdl_v->major, sdl_v->minor, sdl_v->patch);
#elif defined(WITH_SDL2)
#ifdef WITH_SDL2
SDL_version sdl2_v;
SDL_GetVersion(&sdl2_v);
survey["sdl2"] = fmt::format("{}.{}.{}", sdl2_v.major, sdl2_v.minor, sdl2_v.patch);