delete dead code

Author: morganchristiansson

CIO/CControlContainer.cpp

@@ -111,14 +111,6 @@ bool CControlContainer::delText(CFont* TextToDelete)
     return eraseElement(texts, TextToDelete);
 }
 
-CPicture* CControlContainer::addPicture(void callback(int), int clickedParam, Position pos, int picture)
-{
-    pos = pos + Position(border.left, border.top);
-
-    pictures.emplace_back(std::make_unique<CPicture>(callback, clickedParam, pos, picture));
-    return pictures.back().get();
-}
-
 CPicture* CControlContainer::addPicture(void callback(int), int clickedParam, Position pos, ArchiveID archive,
                                         int localIndex)
 {
@@ -133,17 +125,6 @@ bool CControlContainer::delPicture(CPicture* PictureToDelete)
     return eraseElement(pictures, PictureToDelete);
 }
 
-int CControlContainer::addStaticPicture(Position pos, int picture)
-{
-    if(picture < 0)
-        return -1;
-    pos = pos + Position(border.left, border.top);
-
-    unsigned id = static_pictures.empty() ? 0u : static_pictures.back().id + 1u;
-    static_pictures.emplace_back(Picture{pos, ArchiveID::Io, picture, id});
-    return id;
-}
-
 int CControlContainer::addStaticPicture(Position pos, ArchiveID archive, int localIndex)
 {
     if(localIndex < 0)

CIO/CControlContainer.h

@@ -88,12 +88,8 @@ class CControlContainer
     bool delButton(CButton* ButtonToDelete);
     CFont* addText(std::string string, Position pos, FontSize fontsize, FontColor color = FontColor::Yellow);
     bool delText(CFont* TextToDelete);
-    CPicture* addPicture(void callback(int), int clickedParam, Position pos, int picture);
     CPicture* addPicture(void callback(int), int clickedParam, Position pos, ArchiveID archive, int localIndex);
     bool delPicture(CPicture* PictureToDelete);
-    /// Add a static picture from the legacy flat archive.
-    int addStaticPicture(Position pos, int picture);
-    /// Add a static picture from a typed archive.
     int addStaticPicture(Position pos, ArchiveID archive, int localIndex);
     bool delStaticPicture(int picId);
     CTextfield* addTextfield(Position pos = {0, 0}, Uint16 cols = 10, Uint16 rows = 1,

CIO/CFont.cpp

@@ -8,7 +8,6 @@
 #include "../CSurface.h"
 #include "../Texture.h"
 #include "../globals.h"
-#include "../include/SdlSurface.h"
 #include "CollisionDetection.h"
 #include <libsiedler2/ArchivItem_Bitmap.h>
 #include <libsiedler2/ArchivItem_Bitmap_Player.h>
@@ -272,19 +271,6 @@ void CFont::draw(const std::string& string, Position pos, FontSize fontsize, Fon
     glEnd();
 }
 
-bool CFont::writeText(SDL_Surface* Surf_Dest, const std::string& string, unsigned x, unsigned y, FontSize fontsize,
-                      FontColor color, FontAlign align)
-{
-    (void)Surf_Dest;
-    (void)string;
-    (void)x;
-    (void)y;
-    (void)fontsize;
-    (void)color;
-    (void)align;
-    return true;
-}
-
 unsigned CFont::getTextWidth(const std::string& string, FontSize fontsize)
 {
     unsigned w = 0;

CIO/CFont.h

@@ -66,15 +66,7 @@ class CFont
     }
 
     /// Static helper: draw text onto an SDL surface (for terrain / minimap rendering).
-    static bool writeText(SDL_Surface* Surf_Dest, const std::string& string, unsigned x = 0, unsigned y = 0,
-                          FontSize fontsize = FontSize::Small, FontColor color = FontColor::Yellow,
-                          FontAlign align = FontAlign::Left);
-    static bool writeText(SdlSurface& Surf_Dest, const std::string& string, Position pos,
-                          FontSize fontsize = FontSize::Small, FontColor color = FontColor::Yellow,
-                          FontAlign align = FontAlign::Left)
-    {
-        return writeText(Surf_Dest.get(), string, pos.x, pos.y, fontsize, color, align);
-    }
+
 
     /// Compute the pixel width of a string without drawing it.
     static unsigned getTextWidth(const std::string& string, FontSize fontsize);

CIO/CPicture.cpp

@@ -10,24 +10,6 @@
 #include <libsiedler2/Archiv.h>
 #include <libsiedler2/ArchivItem_Bitmap.h>
 
-CPicture::CPicture(void callback(int), int clickedParam, Position pos, int picture) : pos_(pos), archive_(ArchiveID::Io)
-{
-    marked = false;
-    clicked = false;
-    if(picture >= 0)
-        this->picture_ = picture;
-    else
-        this->picture_ = 0;
-    // Get size from the typed archive (defaults to Io)
-    auto& archiv = global::typedArchives[ArchiveID::Io];
-    if(auto* bmp = dynamic_cast<const libsiedler2::baseArchivItem_Bitmap*>(archiv.get(picture_)))
-        size_ = Extent(bmp->getWidth(), bmp->getHeight());
-    this->callback = callback;
-    this->clickedParam = clickedParam;
-    motionEntryParam = -1;
-    motionLeaveParam = -1;
-}
-
 CPicture::CPicture(void callback(int), int clickedParam, Position pos, ArchiveID archive, int picture)
     : pos_(pos), archive_(archive), picture_(picture >= 0 ? picture : 0)
 {

CIO/CPicture.h

@@ -26,9 +26,6 @@ class CPicture
     int motionLeaveParam;
 
 public:
-    /// Old constructor — uses int index (archive defaults to Io).
-    CPicture(void callback(int), int clickedParam, Position pos = {0, 0}, int picture = -1);
-    /// Typed constructor — looks up from a named archive.
     CPicture(void callback(int), int clickedParam, Position pos, ArchiveID archive, int picture);
     // Access
     int getX() const { return pos_.x; };

CSurface.cpp

@@ -82,111 +82,6 @@ static void DrawFadedTexturedTrigon(const Point16& p1, const Point16& p2, const
 
 bool CSurface::drawTextures = false;
 
-bool CSurface::Draw(SDL_Surface* Surf_Dest, SDL_Surface* Surf_Src, int X, int Y)
-{
-    if(!Surf_Dest || !Surf_Src)
-        return false;
-
-    SDL_Rect DestR;
-
-    DestR.x = X;
-    DestR.y = Y;
-
-    SDL_BlitSurface(Surf_Src, nullptr, Surf_Dest, &DestR);
-
-    return true;
-}
-
-bool CSurface::Draw(SDL_Surface* Surf_Dest, SdlSurface& Surf_Src, int X, int Y)
-{
-    return Draw(Surf_Dest, Surf_Src.get(), X, Y);
-}
-
-bool CSurface::Draw(SdlSurface& Surf_Dest, SdlSurface& Surf_Src, Position pos)
-{
-    return Draw(Surf_Dest.get(), Surf_Src.get(), pos.x, pos.y);
-}
-
-bool CSurface::Draw(SdlSurface& Surf_Dest, SDL_Surface* Surf_Src, int X, int Y)
-{
-    return Draw(Surf_Dest.get(), Surf_Src, X, Y);
-}
-
-bool CSurface::Draw(SDL_Surface* Surf_Dest, SDL_Surface* Surf_Src, Position dest, Position srcOffset, Extent srcSize)
-{
-    if(!Surf_Dest || !Surf_Src)
-        return false;
-
-    SDL_Rect DestR;
-
-    DestR.x = dest.x;
-    DestR.y = dest.y;
-
-    SDL_Rect SrcR;
-
-    SrcR.x = srcOffset.x;
-    SrcR.y = srcOffset.y;
-    SrcR.w = static_cast<int>(srcSize.x);
-    SrcR.h = static_cast<int>(srcSize.y);
-
-    SDL_BlitSurface(Surf_Src, &SrcR, Surf_Dest, &DestR);
-
-    return true;
-}
-
-bool CSurface::Draw(SDL_Surface* Surf_Dest, SdlSurface& Surf_Src, Position dest, Position srcOffset, Extent srcSize)
-{
-    return Draw(Surf_Dest, Surf_Src.get(), dest, srcOffset, srcSize);
-}
-
-// this is the example function from the SDL-documentation to draw pixels
-void CSurface::DrawPixel_Color(SDL_Surface* screen, Position pos, Uint32 color)
-{
-    int bpp = screen->format->BytesPerPixel;
-    /* Here p is the address to the pixel we want to retrieve */
-    Uint8* p = (Uint8*)screen->pixels + static_cast<int>(pos.y) * screen->pitch + static_cast<int>(pos.x) * bpp;
-
-    if(SDL_MUSTLOCK(screen))
-        SDL_LockSurface(screen);
-
-    switch(bpp)
-    {
-        case 1: *p = color; break;
-
-        case 2: *(Uint16*)p = color; break;
-
-        case 3:
-            if((SDL_BYTEORDER) == SDL_LIL_ENDIAN)
-            {
-                p[0] = color;
-                p[1] = color >> 8;
-                p[2] = color >> 16;
-            } else
-            {
-                p[2] = color;
-                p[1] = color >> 8;
-                p[0] = color >> 16;
-            }
-            break;
-
-        case 4: *(Uint32*)p = color; break;
-    }
-
-    if(SDL_MUSTLOCK(screen))
-        SDL_UnlockSurface(screen);
-}
-
-// this is the example function from the sdl-documentation to draw pixels
-void CSurface::DrawPixel_RGB(SDL_Surface* screen, Position pos, Uint8 R, Uint8 G, Uint8 B)
-{
-    DrawPixel_Color(screen, pos, SDL_MapRGB(screen->format, R, G, B));
-}
-
-void CSurface::DrawPixel_RGBA(SDL_Surface* screen, Position pos, Uint8 R, Uint8 G, Uint8 B, Uint8 A)
-{
-    DrawPixel_Color(screen, pos, SDL_MapRGBA(screen->format, R, G, B, A));
-}
-
 void CSurface::DrawTriangleField(const DisplayRectangle& displayRect, const bobMAP& myMap)
 {
     Uint16 width = myMap.width;

CSurface.h

@@ -6,50 +6,12 @@
 #pragma once
 
 #include "defines.h"
-#include <SDL.h>
 
 struct vector;
 
 class CSurface
 {
-    friend class CDebug;
-
 public:
-    // blits from source on destination to position X,Y
-    static bool Draw(SDL_Surface* Surf_Dest, SDL_Surface* Surf_Src, int X, int Y);
-    static bool Draw(SDL_Surface* Surf_Dest, SdlSurface& Surf_Src, int X, int Y);
-    static bool Draw(SdlSurface& Surf_Dest, SdlSurface& Surf_Src, Position pos = {0, 0});
-    static bool Draw(SdlSurface& Surf_Dest, SDL_Surface* Surf_Src, int X = 0, int Y = 0);
-
-    // blits rectangle from source on destination
-    static bool Draw(SDL_Surface* Surf_Dest, SDL_Surface* Surf_Src, Position dest, Position srcOffset, Extent srcSize);
-    static bool Draw(SDL_Surface* Surf_Dest, SdlSurface& Surf_Src, Position dest, Position srcOffset, Extent srcSize);
-    static bool Draw(SdlSurface& Surf_Dest, SdlSurface& Surf_Src, Position dest, Position srcOffset, Extent srcSize)
-    {
-        return Draw(Surf_Dest.get(), Surf_Src.get(), dest, srcOffset, srcSize);
-    }
-    // convenience overload for non-UI callers
-    static bool Draw(SDL_Surface* Surf_Dest, SDL_Surface* Surf_Src, int X, int Y, int X2, int Y2, int W, int H)
-    {
-        return Draw(Surf_Dest, Surf_Src, Position(X, Y), Position(X2, Y2),
-                    Extent(static_cast<unsigned>(W), static_cast<unsigned>(H)));
-    }
-    static bool Draw(SDL_Surface* Surf_Dest, SdlSurface& Surf_Src, int X, int Y, int X2, int Y2, int W, int H)
-    {
-        return Draw(Surf_Dest, Surf_Src.get(), X, Y, X2, Y2, W, H);
-    }
-    static bool Draw(SdlSurface& Surf_Dest, SdlSurface& Surf_Src, int X, int Y, int X2, int Y2, int W, int H)
-    {
-        return Draw(Surf_Dest.get(), Surf_Src.get(), X, Y, X2, Y2, W, H);
-    }
-    static void DrawPixel_Color(SDL_Surface* screen, Position pos, Uint32 color);
-    static void DrawPixel_RGB(SDL_Surface* screen, Position pos, Uint8 R, Uint8 G, Uint8 B);
-    static void DrawPixel_RGB(SdlSurface& screen, Position pos, Uint8 R, Uint8 G, Uint8 B)
-    {
-        DrawPixel_RGB(screen.get(), pos, R, G, B);
-    }
-    static void DrawPixel_RGBA(SDL_Surface* screen, Position pos, Uint8 R, Uint8 G, Uint8 B, Uint8 A);
-
     /// Render terrain into the current GL framebuffer.
     /// displayRect specifies the visible area in map-pixel coordinates.
     static void DrawTriangleField(const DisplayRectangle& displayRect, const bobMAP& myMap);

include/SdlSurface.h

@@ -1,50 +1,14 @@
-// Copyright (C) 2009 - 2021 Marc Vester (XaserLE)
-// Copyright (C) 2009 - 2021 Settlers Freaks <sf-team at siedler25.org>
+// Copyright (C) 2009 - 2025 Settlers Freaks <sf-team at siedler25.org>
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once
 
 #include <SDL.h>
-#include <array>
 #include <memory>
 
-struct SdlSurfaceDeleter
-{
-    void operator()(SDL_Surface* p) { SDL_FreeSurface(p); }
-};
-struct SdlTextureDeleter
-{
-    void operator()(SDL_Texture* p) { SDL_DestroyTexture(p); }
-};
 struct SDLWindowDestroyer
 {
     void operator()(SDL_Window* p) const { SDL_DestroyWindow(p); }
 };
-struct SDLRendererDestroyer
-{
-    void operator()(SDL_Renderer* p) const { SDL_DestroyRenderer(p); }
-};
-
-using SdlRenderer = std::unique_ptr<SDL_Renderer, SDLRendererDestroyer>;
 using SdlWindow = std::unique_ptr<SDL_Window, SDLWindowDestroyer>;
-using SdlSurface = std::unique_ptr<SDL_Surface, SdlSurfaceDeleter>;
-using SdlTexture = std::unique_ptr<SDL_Texture, SdlTextureDeleter>;
-
-inline SdlSurface makeRGBSurface(unsigned width, unsigned height, bool withAlpha = false)
-{
-    return SdlSurface(SDL_CreateRGBSurface(0, static_cast<int>(width), static_cast<int>(height), 32, 0xFF0000, 0xFF00,
-                                           0xFF, withAlpha ? 0xFF000000 : 0));
-}
-inline SdlSurface makePalSurface(unsigned width, unsigned height, const std::array<SDL_Color, 256>& palette)
-{
-    auto surf = SdlSurface(SDL_CreateRGBSurface(0, static_cast<int>(width), static_cast<int>(height), 8, 0, 0, 0, 0));
-    if(surf)
-        SDL_SetPaletteColors(surf->format->palette, palette.data(), 0, palette.size());
-    return surf;
-}
-
-inline SdlTexture makeSdlTexture(const SdlRenderer& renderer, Uint32 format, int access, int w, int h)
-{
-    return SdlTexture(SDL_CreateTexture(renderer.get(), format, access, w, h));
-}

include/defines.h

@@ -7,7 +7,6 @@
 
 #include "Point.h"
 #include "Rect.h"
-#include "SdlSurface.h"
 #include "gameData/DescIdx.h"
 #include <SDL.h>
 #include <array>