Merge pull request #795 from Daft-Freak/remove-deprecated

Remove deprecated compatibility wrapper
32blit · Feb 23, 2023 · 40a84ee · 40a84ee
2 parents 52e87e6 + a1013a3
commit 40a84ee
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 35 deletions.
diff --git a/32blit.cmake b/32blit.cmake
diff --git a/32blit/32blit.hpp b/32blit/32blit.hpp
@@ -22,7 +22,6 @@
 #include "graphics/font.hpp"
 #include "graphics/jpeg.hpp"
 #include "graphics/mode7.hpp"
-#include "graphics/sprite.hpp"
 #include "graphics/surface.hpp"
 #include "graphics/tilemap.hpp"
 #include "math/constants.hpp"

diff --git a/32blit/graphics/sprite.cpp b/32blit/graphics/sprite.cpp
@@ -4,7 +4,6 @@
 #include <cstring>
 
 #include "surface.hpp"
-#include "sprite.hpp"
 
 #include "../engine/file.hpp"
 

diff --git a/32blit/graphics/sprite.hpp b/32blit/graphics/sprite.hpp
diff --git a/32blit/graphics/surface.cpp b/32blit/graphics/surface.cpp
@@ -5,7 +5,6 @@
 #include <string>
 
 #include "font.hpp"
-#include "sprite.hpp"
 #include "surface.hpp"
 
 #include "../engine/file.hpp"

diff --git a/32blit/graphics/surface.hpp b/32blit/graphics/surface.hpp
@@ -191,11 +191,6 @@ namespace blit {
 
     void stretch_blit_vspan(Surface *src, Point uv, uint16_t sc, Point p, int16_t dc);
 
-    [[deprecated]]
-    void blit(Surface *src, Rect r, Point p, bool hflip) {
-      blit(src, r, p, hflip ? SpriteTransform::HORIZONTAL : 0);
-    }
-
     void custom_blend(Surface *src, Rect r, Point p, std::function<void(uint8_t *psrc, uint8_t *pdest, int16_t c)> f);
     void custom_modify(Rect r, std::function<void(uint8_t *p, int16_t c)> f);
     void watermark();
@@ -212,16 +207,6 @@ namespace blit {
     Rect sprite_bounds(const Point &p);
     Rect sprite_bounds(const Rect &r);
 
-    [[deprecated]]
-    void blit_sprite(const Rect &src, const Point &p, uint8_t t = 0) {
-      blit(sprites, src, p, t);
-    }
-
-    [[deprecated]]
-    void stretch_blit_sprite(const Rect &src, const Rect &r, uint8_t t = 0) {
-      stretch_blit(sprites, src, r, t);
-    }
-
     void sprite(const Rect &sprite, const Point &position, uint8_t transform = 0);
     void sprite(const Point &sprite, const Point &position, uint8_t transform = 0);
     void sprite(uint16_t sprite, const Point &position, uint8_t transform = 0);

diff --git a/32blit/graphics/tilemap.hpp b/32blit/graphics/tilemap.hpp
@@ -6,7 +6,6 @@
 #include "../types/size.hpp"
 #include "../types/point.hpp"
 #include "../types/mat3.hpp"
-#include "../graphics/sprite.hpp"
 
 namespace blit {
 

diff --git a/launcher-shared/metadata.cpp b/launcher-shared/metadata.cpp
@@ -1,6 +1,6 @@
 #include <cstring>
 
-#include "graphics/sprite.hpp"
+#include "graphics/surface.hpp"
 
 #include "metadata.hpp"
 #include "executable.hpp"