mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

🧹 LoadArt: BYTE -> uint8_t 

The change in include order necessitated a couple of other minor
cleanups, one in stubs.h and one in sdl2_to_1_2_backports.h
pull/2045/head
Gleb Mazovetskiy 5 years ago committed by Anders Jenbo
parent
bcd86b6c15
commit
b76f7656f3
9 changed files with 31 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      Source/DiabloUI/art.cpp
  2. 5
      Source/DiabloUI/art.h
  3. 1
      Source/DiabloUI/art_draw.h
  4. 4
      Source/DiabloUI/errorart.cpp
  5. 8
      Source/DiabloUI/errorart.h
  6. 2
      Source/dx.cpp
  7. 1
      Source/engine/render/text_render.hpp
  8. 13
      Source/utils/sdl2_to_1_2_backports.h
  9. 28
      Source/utils/stubs.h

7
Source/DiabloUI/art.cpp
Unescape View File

@ -1,10 +1,9 @@
#include "art.h"
#include "DiabloUI/art.h"
#include <cstddef>
#include <cstdint>
#include <memory>
#include "DiabloUI/art.h"
#include "storm/storm.h"
#include "utils/display.h"
#include "utils/log.hpp"
@ -142,13 +141,13 @@ void LoadMaskedArt(const char *pszFile, Art *art, int frames, int mask)
SDLC_SetColorKey(art->surface.get(), mask);
}
void LoadArt(Art *art, const BYTE *artData, int w, int h, int frames)
void LoadArt(Art *art, const std::uint8_t *artData, int w, int h, int frames)
{
constexpr int DefaultArtBpp = 8;
constexpr int DefaultArtFormat = SDL_PIXELFORMAT_INDEX8;
art->frames = frames;
art->surface = ScaleSurfaceToOutput(SDLSurfaceUniquePtr { SDL_CreateRGBSurfaceWithFormatFrom(
const_cast<BYTE *>(artData), w, h, DefaultArtBpp, w, DefaultArtFormat) });
const_cast<std::uint8_t *>(artData), w, h, DefaultArtBpp, w, DefaultArtFormat) });
art->logical_width = w;
art->frame_height = h / frames;
}

5
Source/DiabloUI/art.h
Unescape View File

@ -1,6 +1,7 @@
#pragma once
#include "storm/storm.h"
#include <cstdint>
#include "utils/sdl_ptrs.h"
namespace devilution {
@ -39,6 +40,6 @@ struct Art {
void LoadArt(const char *pszFile, Art *art, int frames = 1, SDL_Color *pPalette = NULL);
void LoadMaskedArt(const char *pszFile, Art *art, int frames = 1, int mask = 250);
void LoadArt(Art *art, const BYTE *artData, int w, int h, int frames = 1);
void LoadArt(Art *art, const std::uint8_t *artData, int w, int h, int frames = 1);
} // namespace devilution

1
Source/DiabloUI/art_draw.h
Unescape View File

@ -1,6 +1,7 @@
#pragma once
#include "DiabloUI/art.h"
#include "engine.h"
namespace devilution {

4
Source/DiabloUI/errorart.cpp
Unescape View File

@ -2,7 +2,7 @@
namespace devilution {
const unsigned char btnData[] = {
const std::uint8_t btnData[] = {
// clang-format off
0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
@ -63,7 +63,7 @@ const unsigned char btnData[] = {
// clang-format on
};
const unsigned char popupData[] = {
const std::uint8_t popupData[] = {
// clang-format off
0xDE, 0xB5, 0xB5, 0xB5, 0xB6, 0xB7, 0xB8, 0xB4, 0xB1, 0xB1, 0xB0, 0xB0, 0xB0, 0xB1, 0xB1, 0xB4, 0xB4, 0xB4, 0xB6, 0xB4, 0xB4, 0xB4, 0xB4, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB8, 0xB7, 0xB6, 0xB5, 0xB5, 0xB4, 0xB4, 0xB1, 0xB1, 0xB0, 0xB0, 0xB0, 0xB1, 0xB1, 0xB4, 0xB4, 0xB4, 0xB1, 0xB1, 0xB0, 0xB0, 0xB0, 0xB1, 0xB1, 0xB4, 0xB4, 0xB4, 0xB6, 0xB4, 0xB4, 0xB4, 0xB4, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB8, 0xB7, 0xB6, 0xB5, 0xB5, 0xB4, 0xB4, 0xB1, 0xB1, 0xB0, 0xB0, 0xB0, 0xB1, 0xB1, 0xB4, 0xB4, 0xB4, 0xB6, 0xB4, 0xB4, 0xB4, 0xB4, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB8, 0xB7, 0xB6, 0xB5, 0xB5, 0xB4, 0xB4, 0xB1, 0xB1, 0xB0, 0xB0, 0xB0, 0xB1, 0xB1, 0xB4, 0xB4, 0xB4, 0xB6, 0xB8, 0xB7, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB8, 0xB7, 0xB6, 0xB5, 0xB5, 0xB4, 0xB4, 0xB1, 0xB1, 0xB0, 0xB0, 0xB0, 0xB1, 0xB1, 0xB4, 0xB4, 0xB4, 0xB6, 0xB4, 0xB4, 0xB4, 0xB4, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB8, 0xB7, 0xB6, 0xB5, 0xB5, 0xB4, 0xB4, 0xB1, 0xB1, 0xB0, 0xB0, 0xB0, 0xB1, 0xB1, 0xB4, 0xB4, 0xB4, 0xB6, 0xB8, 0xB7, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB8, 0xB7, 0xB6, 0xB5, 0xB5, 0xB4, 0xB4, 0xB1, 0xB1, 0xB0, 0xB0, 0xB0, 0xB1, 0xB1, 0xB4, 0xB4, 0xB4, 0xB6, 0xB8, 0xB7, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB8, 0xB7, 0xB6, 0xB5, 0xB5, 0xB4, 0xB4, 0xB1, 0xB1, 0xB0, 0xB0, 0xB0, 0xB1, 0xB1, 0xB4, 0xB4, 0xB4, 0xB6, 0xB4, 0xB4, 0xB4, 0xB4, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB8, 0xB7, 0xB6, 0xB5, 0xB5, 0xB4, 0xB4, 0xB1, 0xB1, 0xB0, 0xB0, 0xB0, 0xB1, 0xB1, 0xB4, 0xB4, 0xB4, 0xB6, 0xB8, 0xB7, 0xB6, 0xB5, 0xB5, 0xB4, 0xB4, 0xB1, 0xB1, 0xB0, 0xB0, 0xB0, 0xB1, 0xB1, 0xB4, 0xB4, 0xB4, 0xB4, 0xB1, 0xB1, 0xB0, 0xB0, 0xB0, 0xB1, 0xB1, 0xB4, 0xB4, 0xB4, 0xB6, 0xB4, 0xB4, 0xB4, 0xB4, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB8, 0xB7, 0xB6, 0xB5, 0xB5, 0xB4, 0xB4, 0xB1, 0xB1, 0xB0, 0xB0, 0xB0, 0xB1, 0xB1, 0xB4, 0xB4, 0xB4, 0xB6, 0xB8, 0xB7, 0xB6, 0xB5, 0xB5, 0xB4, 0xB4, 0xB1, 0xB1, 0xB0, 0xB0, 0xB0, 0xB1, 0xB1, 0xB4, 0xB4, 0xB4, 0xB4, 0xB1, 0xB1, 0xB0, 0xB0, 0xB0, 0xB1, 0xB1, 0xB4, 0xB4, 0xB4, 0xB6, 0xB4, 0xB4, 0xB4, 0xB4, 0xB6, 0xB6, 0xB6, 0xB6, 0xB8, 0xB7, 0xB6, 0xB5, 0xB5, 0xB5, 0xDE,
0xDC, 0xB5, 0xBE, 0xBE, 0xBE, 0xBE, 0xB7, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xB1, 0xB0, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xB1, 0xB0, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xB1, 0xB0, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xB1, 0xB1, 0xB0, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xB1, 0xB0, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xB1, 0xB0, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xB1, 0xB0, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xB7, 0xBE, 0xBE, 0xBE, 0xBE, 0xB5, 0xDC,

8
Source/DiabloUI/errorart.h
Unescape View File

@ -1,8 +1,12 @@
#pragma once
#include <cstdint>
#include "engine.h"
namespace devilution {
extern const unsigned char btnData[];
extern const unsigned char popupData[];
extern const std::uint8_t btnData[];
extern const std::uint8_t popupData[];
} // namespace devilution

2
Source/dx.cpp
Unescape View File

@ -185,8 +185,10 @@ void dx_cleanup()
pal_surface = nullptr;
SDL_FreePalette(palette);
SDL_FreeSurface(renderer_texture_surface);
#ifndef USE_SDL1
SDL_DestroyTexture(texture);
SDL_DestroyRenderer(renderer);
#endif
SDL_DestroyWindow(ghMainWnd);
}

1
Source/engine/render/text_render.hpp
Unescape View File

@ -11,6 +11,7 @@
#include "DiabloUI/ui_item.h"
#include "engine.h"
#include "utils/stdcompat/optional.hpp"
namespace devilution {

13
Source/utils/sdl2_to_1_2_backports.h
Unescape View File

@ -11,7 +11,6 @@
#include "utils/attributes.h"
#include "utils/console.h"
#include "utils/stubs.h"
#define WINDOW_ICON_NAME 0
@ -174,22 +173,10 @@ SDL_WarpMouseInWindow(SDL_Window *window, int x, int y)
#define SDL_Renderer void
inline void SDL_DestroyRenderer(SDL_Renderer *renderer)
{
if (renderer != NULL)
UNIMPLEMENTED();
}
//= Texture stubs
#define SDL_Texture void
inline void SDL_DestroyTexture(SDL_Texture *texture)
{
if (texture != NULL)
UNIMPLEMENTED();
}
//= Palette handling
inline SDL_Palette *

28
Source/utils/stubs.h
Unescape View File

@ -1,23 +1,21 @@
#pragma once
#include <cassert>
#include <cstdio>
#include <cstdlib>
#include "utils/log.hpp"
#define UNIMPLEMENTED() \
do { \
SDL_Log("UNIMPLEMENTED: %s @ %s:%i", __FUNCTION__, __FILE__, __LINE__); \
abort(); \
#define UNIMPLEMENTED() \
do { \
::devilution::LogDebug("UNIMPLEMENTED: {} @ {}:{}", __FUNCTION__, __FILE__, __LINE__); \
abort(); \
} while (0)
#define ABORT() \
do { \
SDL_Log("ABORT: %s @ %s:%i", __FUNCTION__, __FILE__, __LINE__); \
abort(); \
#define ABORT() \
do { \
::devilution::LogCritical("ABORT: {} @ {}:{}", __FUNCTION__, __FILE__, __LINE__); \
abort(); \
} while (0)
#define ASSERT(x) \
if (!(x)) { \
SDL_Log("Assertion failed in %s:%i: %s", __FILE__, __LINE__, #x); \
abort(); \
#define ASSERT(x) \
if (!(x)) { \
::devilution::LogCritical("Assertion failed in {}:{}: {}", __FILE__, __LINE__, #x); \
abort(); \
}

Write Preview
Loading…
Cancel
Save