diff --git a/src/client/http/ImageRequest.cpp b/src/client/http/ImageRequest.cpp index 2056c8ce1..01ee903a4 100644 --- a/src/client/http/ImageRequest.cpp +++ b/src/client/http/ImageRequest.cpp @@ -9,10 +9,6 @@ namespace http size(size) {} - ImageRequest::ImageRequest(ByteString url, int width, int height): - ImageRequest(url, Vec2(width, height)) - {} - ImageRequest::~ImageRequest() {} diff --git a/src/client/http/ImageRequest.h b/src/client/http/ImageRequest.h index 7e7ac2f50..90d8313cb 100644 --- a/src/client/http/ImageRequest.h +++ b/src/client/http/ImageRequest.h @@ -15,8 +15,6 @@ namespace http public: ImageRequest(ByteString url, Vec2 size); - [[deprecated("Use ImageRequest(ByteString, Vec)")]] - ImageRequest(ByteString url, int width, int height); virtual ~ImageRequest(); std::unique_ptr Finish(); diff --git a/src/client/http/ThumbnailRequest.cpp b/src/client/http/ThumbnailRequest.cpp index fdda412c1..c690f3a2c 100644 --- a/src/client/http/ThumbnailRequest.cpp +++ b/src/client/http/ThumbnailRequest.cpp @@ -3,12 +3,12 @@ namespace http { - ThumbnailRequest::ThumbnailRequest(int saveID, int saveDate, int width, int height) : + ThumbnailRequest::ThumbnailRequest(int saveID, int saveDate, Vec2 size) : ImageRequest(( saveDate ? ByteString::Build(STATICSCHEME, STATICSERVER, "/", saveID, "_", saveDate, "_small.png") : ByteString::Build(STATICSCHEME, STATICSERVER, "/", saveID, "_small.png") - ), width, height) + ), size) { } diff --git a/src/client/http/ThumbnailRequest.h b/src/client/http/ThumbnailRequest.h index b59baf293..f19c4bbc4 100644 --- a/src/client/http/ThumbnailRequest.h +++ b/src/client/http/ThumbnailRequest.h @@ -6,7 +6,7 @@ namespace http class ThumbnailRequest : public ImageRequest { public: - ThumbnailRequest(int saveID, int saveDate, int width, int height); + ThumbnailRequest(int saveID, int saveDate, Vec2 size); virtual ~ThumbnailRequest(); }; } diff --git a/src/gui/interface/AvatarButton.cpp b/src/gui/interface/AvatarButton.cpp index e213bb584..6b47b25ac 100644 --- a/src/gui/interface/AvatarButton.cpp +++ b/src/gui/interface/AvatarButton.cpp @@ -22,7 +22,7 @@ void AvatarButton::Tick(float dt) if (!avatar && !tried && name.size() > 0) { tried = true; - imageRequest = std::make_unique(ByteString::Build(SCHEME, STATICSERVER, "/avatars/", name, ".png"), Size.X, Size.Y); + imageRequest = std::make_unique(ByteString::Build(SCHEME, STATICSERVER, "/avatars/", name, ".png"), Size); imageRequest->Start(); } diff --git a/src/gui/interface/SaveButton.cpp b/src/gui/interface/SaveButton.cpp index 5c336a632..3c0ea7776 100644 --- a/src/gui/interface/SaveButton.cpp +++ b/src/gui/interface/SaveButton.cpp @@ -137,7 +137,7 @@ void SaveButton::Tick(float dt) } else if (save->GetID()) { - thumbnailRequest = std::make_unique(save->GetID(), save->GetVersion(), thumbBoxSize.X, thumbBoxSize.Y); + thumbnailRequest = std::make_unique(save->GetID(), save->GetVersion(), thumbBoxSize); thumbnailRequest->Start(); triedThumbnail = true; }