mirror of
https://github.com/diasurgical/DevilutionX.git
synced 2026-10-12 02:13:06 +00:00
Gleb MazovetskiyandClaude Fable 5
ac2d7fc731
- `fmt::format` with literal format strings -> `std::format`. - `fmt::format(fmt::runtime(...))` -> `FormatRuntime` in the new `utils/format.hpp`, a std::vformat wrapper that is also safe under the P2905 lvalue requirement of `std::make_format_args`. - `fmt::dynamic_format_arg_store` (Lua logging) -> a small hand-rolled per-field formatter over `std::variant`, returning `std::expected`. - `fmt::format_int` -> `std::to_chars`. - `fmt::join` -> manual joins at the two call sites. - SDL_audiolib: new patch that rewrites aulib_log.h to use std::format and drops the fmt dependency from its CMakeLists. - The `-static-libstdc++` guard now keys off `DEVILUTIONX_STATIC_SDL_AUDIOLIB` instead of `DEVILUTIONX_STATIC_LIBFMT`. - libfmt removed from CMake, vcpkg, Brewfile, CI workflows, Dockerfiles, packaging scripts, UWP project, and docs. - macOS bumped to 13.3+, iOS to 16.3+ (required for `<format>`) - Amiga m68k: provide `__cmpdf2`, which is missing from the hard-float libgcc multilib but referenced via libstdc++'s long double paths. Co-Authored-By: Claude Fable 5 <[email protected]>
61 lines
1.2 KiB
C++
61 lines
1.2 KiB
C++
#include "engine/trn.hpp"
|
|
|
|
#include <cstdint>
|
|
|
|
#ifdef _DEBUG
|
|
#include "debug.h"
|
|
#endif
|
|
#include "engine/load_file.hpp"
|
|
#include "lighting.h"
|
|
#include "utils/str_cat.hpp"
|
|
|
|
namespace devilution {
|
|
|
|
uint8_t *GetInfravisionTRN()
|
|
{
|
|
return InfravisionTable.data();
|
|
}
|
|
|
|
uint8_t *GetStoneTRN()
|
|
{
|
|
return StoneTable.data();
|
|
}
|
|
|
|
uint8_t *GetPauseTRN()
|
|
{
|
|
return PauseTable.data();
|
|
}
|
|
|
|
std::optional<std::array<uint8_t, 256>> GetClassTRN(Player &player)
|
|
{
|
|
std::array<uint8_t, 256> trn;
|
|
char path[64];
|
|
|
|
const PlayerSpriteData &spriteData = GetPlayerSpriteDataForClass(player._pClass);
|
|
*BufCopy(path, "plrgfx\\", spriteData.trn, ".trn") = '\0';
|
|
|
|
#ifdef _DEBUG
|
|
if (!debugTRN.empty()) {
|
|
*BufCopy(path, debugTRN.c_str()) = '\0';
|
|
}
|
|
#endif
|
|
if (LoadOptionalFileInMem(path, &trn[0], 256)) {
|
|
return trn;
|
|
}
|
|
return std::nullopt;
|
|
}
|
|
|
|
std::optional<std::array<uint8_t, 256>> GetPlayerGraphicTRN(const char *pszName)
|
|
{
|
|
char path[MaxMpqPathSize];
|
|
*BufCopy(path, pszName, ".trn") = '\0';
|
|
|
|
std::array<uint8_t, 256> trn;
|
|
if (LoadOptionalFileInMem(path, &trn[0], 256)) {
|
|
return trn;
|
|
}
|
|
return std::nullopt;
|
|
}
|
|
|
|
} // namespace devilution
|