getBmpTexture().draw()

Author: morganchristiansson

CIO/CButton.cpp

@@ -135,11 +135,8 @@ void CButton::draw(Position parentOrigin) const
     if(button_picture >= 0)
     {
         auto& picTex = getBmpTexture(button_picture);
-        if(picTex.isValid())
-        {
-            const Position picPos = absPos + size_ / 2 - Position(picTex.getSize()) / 2;
-            picTex.draw(picPos);
-        }
+        const Position picPos = absPos + size_ / 2 - Position(picTex.getSize()) / 2;
+        picTex.draw(picPos);
     } else if(button_text)
     {
         // Draw text centered (using native-size texture drawing for each character)

CIO/CControlContainer.cpp

@@ -189,8 +189,6 @@ void CControlContainer::drawChildren(Position origin)
         button->draw(origin);
     for(const auto& static_picture : static_pictures)
     {
-        auto& tex = getBmpTexture(static_picture.pic);
-        if(tex.isValid())
-            tex.draw(origin + static_picture.pos);
+        getBmpTexture(static_picture.pic).draw(origin + static_picture.pos);
     }
 }

CIO/CPicture.cpp

@@ -66,8 +66,5 @@ void CPicture::setMouseData(const SDL_MouseButtonEvent& button)
 
 void CPicture::draw(Position parentOrigin) const
 {
-    auto& tex = getBmpTexture(picture_);
-    if(!tex.isValid())
-        return;
-    tex.draw(parentOrigin + pos_);
+    getBmpTexture(picture_).draw(parentOrigin + pos_);
 }