MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Port essential parts to use SDL abstraction for file access

Browse source
This commit is contained in:
Anders Jenbo 2021-10-20 13:36:54 +02:00
commit 11e37e972a
3 changed files with 26 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Source/engine/load_file.hpp
View file

@ -8,6 +8,7 @@
#include "appfat.h"
#include "diablo.h"
#include "storm/storm.h"
#include "storm/storm_sdl_rw.h"
#include "utils/stdcompat/cstddef.hpp"
namespace devilution {
@ -16,8 +17,8 @@ class SFile {
public:
explicit SFile(const char *path)
{
if (!SFileOpenFile(path, &handle_)) {
handle_ = nullptr;
handle_ = SFileOpenRw(path);
if (handle_ == nullptr) {
if (!gbQuietMode) {
const std::uint32_t code = SErrGetLastError();
if (code == STORM_ERROR_FILE_NOT_FOUND) {
@ -32,7 +33,7 @@ public:
~SFile()
{
if (handle_ != nullptr)
SFileCloseFileThreadSafe(handle_);
SDL_RWclose(handle_);
}
[[nodiscard]] bool Ok() const
@ -42,16 +43,16 @@ public:
[[nodiscard]] std::size_t Size() const
{
return SFileGetFileSize(handle_);
return SDL_RWsize(handle_);
}
bool Read(void *buffer, std::size_t len) const
{
return SFileReadFileThreadSafe(handle_, buffer, len);
return SDL_RWread(handle_, buffer, len, 1);
}
private:
HANDLE handle_;
SDL_RWops *handle_;
};
template <typename T>

14
Source/engine/render/text_render.cpp
View file

@ -127,15 +127,17 @@ std::array<uint8_t, 256> *LoadFontKerning(GameFontTables size, uint16_t row)
auto *kerning = &FontKerns[fontId];
HANDLE handle;
if (IsFullWidth(row)) {
kerning->fill(FontFullwidth[size]);
} else if (SFileOpenFile(path, &handle)) {
SFileReadFileThreadSafe(handle, kerning, 256);
SFileCloseFileThreadSafe(handle);
} else {
LogError("Missing font kerning: {}", path);
kerning->fill(FontFullwidth[size]);
SDL_RWops *handle = SFileOpenRw(path);
if (handle != nullptr) {
SDL_RWread(handle, kerning, 256, 1);
SDL_RWclose(handle);
} else {
LogError("Missing font kerning: {}", path);
kerning->fill(FontFullwidth[size]);
}
}
return kerning;