Extent getBitmapSize

Author: morganchristiansson

CIO/CWindow.cpp

@@ -63,10 +63,13 @@ void CWindow::setMouseData(SDL_MouseMotionEvent motion)
 {
     // cursor is on the title frame (+/-2 and +/-4 are only for a good optic)
     const Position titleFrameLT =
-      pos_ + Position(global::getBitmapSize(ArchiveID::Resource, WINDOW_LEFT_UPPER_CORNER).x, 0) + Position(2, 4);
+      pos_ + Position(static_cast<int>(global::getBitmapSize(ArchiveID::Resource, WINDOW_LEFT_UPPER_CORNER).x), 0)
+      + Position(2, 4);
     const Position titleFrameRB =
-      pos_ + Position(static_cast<int>(size_.x), global::getBitmapSize(ArchiveID::Resource, WINDOW_UPPER_FRAME).y)
-      - Position(global::getBitmapSize(ArchiveID::Resource, WINDOW_RIGHT_UPPER_CORNER).x + 2, 4);
+      pos_
+      + Position(static_cast<int>(size_.x),
+                 static_cast<int>(global::getBitmapSize(ArchiveID::Resource, WINDOW_UPPER_FRAME).y))
+      - Position(static_cast<int>(global::getBitmapSize(ArchiveID::Resource, WINDOW_RIGHT_UPPER_CORNER).x) + 2, 4);
     if(IsPointInRect(motion.x, motion.y, Rect(titleFrameLT, Extent(titleFrameRB - titleFrameLT))))
     {
         // left button was pressed while moving
@@ -91,28 +94,29 @@ void CWindow::setMouseData(SDL_MouseMotionEvent motion)
     {
         // cursor is on the button (+/-2 is only for the optic)
         const auto closeSize = global::getBitmapSize(ArchiveID::Resource, WINDOW_BUTTON_CLOSE);
-        canClose_marked = IsPointInRect(Position(motion.x, motion.y),
-                                        Rect(pos_ + Position(2, 2), Extent(closeSize - Extent(4, 4))));
+        canClose_marked =
+          IsPointInRect(Position(motion.x, motion.y), Rect(pos_ + Position(2, 2), closeSize - Extent(4, 4)));
     }
     // check whats happen to the minimize button
     if(canMinimize)
     {
         // cursor is on the button (+/-2 is only for the optic)
         const auto minSize = global::getBitmapSize(ArchiveID::Resource, WINDOW_BUTTON_MINIMIZE);
-        canMinimize_marked = IsPointInRect(
-          Position(motion.x, motion.y),
-          Rect(pos_ + Position(static_cast<int>(size_.x) - minSize.x + 2, 2), Extent(minSize - Extent(4, 4))));
+        canMinimize_marked =
+          IsPointInRect(Position(motion.x, motion.y),
+                        Rect(pos_ + Position(static_cast<int>(size_.x) - static_cast<int>(minSize.x) + 2, 2),
+                             minSize - Extent(4, 4)));
     }
     // check whats happen to the resize button
     if(canResize)
     {
         // cursor is on the button (+/-2 is only for the optic)
         const auto resizeSize = global::getBitmapSize(ArchiveID::Resource, WINDOW_BUTTON_RESIZE);
-        if(IsPointInRect(
-             Position(motion.x, motion.y),
-             Rect(pos_ + Position(static_cast<int>(size_.x) - resizeSize.x + 2,
-                                  static_cast<int>(size_.y) - resizeSize.y + 2),
-                  Extent(resizeSize - Extent(4, 4)))))
+        if(IsPointInRect(Position(motion.x, motion.y),
+                         Rect(pos_
+                                + Position(static_cast<int>(size_.x) - static_cast<int>(resizeSize.x) + 2,
+                                           static_cast<int>(size_.y) - static_cast<int>(resizeSize.y) + 2),
+                              resizeSize - Extent(4, 4))))
         {
             // left button was pressed while moving
             if(SDL_GetMouseState(nullptr, nullptr) & SDL_BUTTON(SDL_BUTTON_LEFT))

CMap.cpp

@@ -1161,24 +1161,24 @@ void CMap::render()
     Texture::getTexture(ArchiveID::Resource, STATUE_UP_LEFT).Draw(Position(12, 12));
     Texture::getTexture(ArchiveID::Resource, STATUE_UP_RIGHT)
       .Draw(Position(static_cast<int>(displayRect.getSize().x)
-                       - global::getBitmapSize(ArchiveID::Resource, STATUE_UP_RIGHT).x - 12,
+                       - static_cast<int>(global::getBitmapSize(ArchiveID::Resource, STATUE_UP_RIGHT).x) - 12,
                      12));
     Texture::getTexture(ArchiveID::Resource, STATUE_DOWN_LEFT)
       .Draw(Position(12, static_cast<int>(displayRect.getSize().y)
-                           - global::getBitmapSize(ArchiveID::Resource, STATUE_DOWN_LEFT).y - 12));
+                           - static_cast<int>(global::getBitmapSize(ArchiveID::Resource, STATUE_DOWN_LEFT).y) - 12));
     Texture::getTexture(ArchiveID::Resource, STATUE_DOWN_RIGHT)
       .Draw(Position(static_cast<int>(displayRect.getSize().x)
-                       - global::getBitmapSize(ArchiveID::Resource, STATUE_DOWN_RIGHT).x - 12,
+                       - static_cast<int>(global::getBitmapSize(ArchiveID::Resource, STATUE_DOWN_RIGHT).x) - 12,
                      static_cast<int>(displayRect.getSize().y)
-                       - global::getBitmapSize(ArchiveID::Resource, STATUE_DOWN_RIGHT).y - 12));
+                       - static_cast<int>(global::getBitmapSize(ArchiveID::Resource, STATUE_DOWN_RIGHT).y) - 12));
 
     // lower menubar
     const Position menubarPos =
       Position(static_cast<int>(displayRect.getSize().x) / 2, static_cast<int>(displayRect.getSize().y));
     // draw lower menubar
     Texture::getTexture(ArchiveID::Resource, MENUBAR)
-      .Draw(Position(menubarPos.x - global::getBitmapSize(ArchiveID::Resource, MENUBAR).x / 2,
-                     menubarPos.y - global::getBitmapSize(ArchiveID::Resource, MENUBAR).y));
+      .Draw(Position(menubarPos.x - static_cast<int>(global::getBitmapSize(ArchiveID::Resource, MENUBAR).x) / 2,
+                     menubarPos.y - static_cast<int>(global::getBitmapSize(ArchiveID::Resource, MENUBAR).y)));
 
     // draw pictures to lower menubar
     // backgrounds (use button background texture for each slot)

globals.cpp

@@ -92,14 +92,14 @@ bool global::loadPalette(const boost::filesystem::path& filepath)
     return true;
 }
 
-Position global::getBitmapSize(ArchiveID archive, unsigned index)
+Extent global::getBitmapSize(ArchiveID archive, unsigned index)
 {
     auto& archiv = typedArchives[archive];
     if(index >= archiv.size())
-        return {0, 0};
+        return {0u, 0u};
     auto* bmp = dynamic_cast<const libsiedler2::baseArchivItem_Bitmap*>(archiv.get(index));
     if(!bmp)
-        return {0, 0};
+        return {0u, 0u};
     return {bmp->getWidth(), bmp->getHeight()};
 }
 

globals.h

@@ -35,9 +35,8 @@ extern std::map<ArchiveID, libsiedler2::Archiv> typedArchives;
 bool loadArchive(ArchiveID archive, const boost::filesystem::path& filepath,
                  const libsiedler2::ArchivItem_Palette* palette = nullptr);
 
-/// Get the size of a bitmap from a typed archive. Archiv stores uint16_t
-/// which naturally promotes to int — returns Position for signed use.
-Position getBitmapSize(ArchiveID archive, unsigned index);
+/// Get the size of a bitmap from a typed archive.
+Extent getBitmapSize(ArchiveID archive, unsigned index);
 
 /// Load a palette BBM file into currentPalette. Returns true on success.
 bool loadPalette(const boost::filesystem::path& filepath);