Skip to content

Commit 15d30c5

Browse files
committed
SDL3: Add some backports / compat helpers
1 parent 1bbe8bf commit 15d30c5

64 files changed

Lines changed: 749 additions & 1261 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Source/DiabloUI/button.cpp

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "engine/render/clx_render.hpp"
2020
#include "engine/render/text_render.hpp"
2121
#include "engine/surface.hpp"
22+
#include "utils/sdl_compat.h"
2223

2324
namespace devilution {
2425

@@ -65,21 +66,13 @@ bool HandleMouseEventButton(const SDL_Event &event, UiButton *button)
6566
if (event.button.button != SDL_BUTTON_LEFT)
6667
return false;
6768
switch (event.type) {
68-
#ifdef USE_SDL3
6969
case SDL_EVENT_MOUSE_BUTTON_UP:
70-
#else
71-
case SDL_MOUSEBUTTONUP:
72-
#endif
7370
if (button->IsPressed()) {
7471
button->Activate();
7572
return true;
7673
}
7774
return false;
78-
#ifdef USE_SDL3
7975
case SDL_EVENT_MOUSE_BUTTON_DOWN:
80-
#else
81-
case SDL_MOUSEBUTTONDOWN:
82-
#endif
8376
button->Press();
8477
return true;
8578
default:

Source/DiabloUI/credits.cpp

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include "utils/display.h"
3131
#include "utils/is_of.hpp"
3232
#include "utils/language.h"
33+
#include "utils/sdl_compat.h"
3334
#include "utils/sdl_geometry.h"
3435
#include "utils/ui_fwd.h"
3536

@@ -109,11 +110,7 @@ void CreditsRenderer::Render()
109110
return;
110111
prev_offset_y_ = offsetY;
111112

112-
#ifdef USE_SDL3
113113
SDL_FillSurfaceRect(DiabloUiSurface(), nullptr, 0);
114-
#else
115-
SDL_FillRect(DiabloUiSurface(), nullptr, 0x000000);
116-
#endif
117114
const Point uiPosition = GetUIRectangle().position;
118115
if (ArtBackgroundWidescreen)
119116
RenderClxSprite(Surface(DiabloUiSurface()), (*ArtBackgroundWidescreen)[0], uiPosition - Displacement { 320, 0 });
@@ -165,13 +162,8 @@ bool TextDialog(const char *const *text, std::size_t textLines)
165162
UiFadeIn();
166163
while (PollEvent(&event)) {
167164
switch (event.type) {
168-
#ifdef USE_SDL3
169165
case SDL_EVENT_KEY_DOWN:
170166
case SDL_EVENT_MOUSE_BUTTON_UP:
171-
#else
172-
case SDL_KEYDOWN:
173-
case SDL_MOUSEBUTTONUP:
174-
#endif
175167
endMenu = true;
176168
break;
177169
default:

0 commit comments

Comments
 (0)