Portrait support

doc/lua/functions.md

@@ -240,7 +240,10 @@ Closes a spot kicking any player or AI there.
 Add an AI or change its difficulty.
 
 **SetName(name)**  
-Change the players name.
+Change the player's name.
+
+**SetPortrait(portraitIndex)**  
+Change the player's portrait.
 
 [Back](#Lua-objects-and-their-methods)  
 

libs/s25main/BasePlayerInfo.cpp

@@ -8,20 +8,22 @@
 #include "s25util/colors.h"
 
 BasePlayerInfo::BasePlayerInfo()
-    : ps(PlayerState::Free), nation(Nation::Romans), color(PLAYER_COLORS[0]), team(Team::None)
+    : ps(PlayerState::Free), portraitIndex(0), nation(Nation::Romans), color(PLAYER_COLORS[0]), team(Team::None)
 {}
 
 BasePlayerInfo::BasePlayerInfo(Serializer& ser, bool lightData)
     : ps(helpers::popEnum<PlayerState>(ser)), aiInfo(!lightData || ps == PlayerState::AI ? ser : AI::Info())
 {
     if(lightData && !isUsed())
     {
+        portraitIndex = 0;
         nation = Nation::Romans;
         team = Team::None;
         color = PLAYER_COLORS[0];
     } else
     {
         name = ser.PopLongString();
+        portraitIndex = ser.PopUnsignedInt();
         nation = helpers::popEnum<Nation>(ser);
         color = ser.PopUnsignedInt();
         team = helpers::popEnum<Team>(ser);
@@ -36,6 +38,7 @@ void BasePlayerInfo::Serialize(Serializer& ser, bool lightData) const
     if(!lightData || ps == PlayerState::AI)
         aiInfo.serialize(ser);
     ser.PushLongString(name);
+    ser.PushUnsignedInt(portraitIndex);
     helpers::pushEnum<uint8_t>(ser, nation);
     ser.PushUnsignedInt(color);
     helpers::pushEnum<uint8_t>(ser, team);

libs/s25main/BasePlayerInfo.h

@@ -18,6 +18,7 @@ struct BasePlayerInfo
     PlayerState ps;
     AI::Info aiInfo;
     std::string name;
+    unsigned portraitIndex;
     Nation nation;
     /// Actual color (ARGB)
     unsigned color;

libs/s25main/GameLobbyController.cpp

@@ -123,3 +123,8 @@ void GameLobbyController::SetName(unsigned playerIdx, const std::string& name)
 {
     mainPlayer_.sendMsgAsync(new GameMessage_Player_Name(playerIdx, name));
 }
+
+void GameLobbyController::SetPortrait(unsigned playerIdx, unsigned portraitIndex)
+{
+    mainPlayer_.sendMsgAsync(new GameMessage_Player_Portrait(playerIdx, portraitIndex));
+}

libs/s25main/GameLobbyController.h

@@ -28,6 +28,7 @@ class GameLobbyController : public IGameLobbyController
     void SetPlayerState(unsigned playerIdx, PlayerState state, const AI::Info& aiInfo) override;
     void TogglePlayerState(unsigned playerIdx);
     void SetName(unsigned playerIdx, const std::string& name) override;
+    void SetPortrait(unsigned playerIdx, unsigned portraitIndex) override;
     void SetColor(unsigned playerIdx, unsigned newColor) override;
     void SetTeam(unsigned playerIdx, Team newTeam) override;
     void SetNation(unsigned playerIdx, Nation newNation) override;

libs/s25main/SerializedGameData.cpp

@@ -95,7 +95,8 @@
 /// 7: Use helpers::push/popContainer (uses var size)
 /// 8: noFlag::Wares converted to static_vector
 /// 9: Drop serialization of node BQ
-static const unsigned currentGameDataVersion = 9;
+/// 10: Add portrait index serialization in player state
+static const unsigned currentGameDataVersion = 10;
 // clang-format on
 
 std::unique_ptr<GameObject> SerializedGameData::Create_GameObject(const GO_Type got, const unsigned obj_id)

libs/s25main/Settings.cpp

@@ -120,6 +120,7 @@ void Settings::LoadDefaults()
     // {
 
     lobby.name = System::getUserName();
+    lobby.portraitIndex = 0;
     lobby.password.clear();
     lobby.save_password = false;
     // }

libs/s25main/Settings.h

@@ -89,6 +89,7 @@ class Settings : public Singleton<Settings, SingletonPolicies::WithLongevity>
     struct
     {
         std::string name;
+        unsigned portraitIndex;
         std::string password;
         bool save_password;
     } lobby;

libs/s25main/controls/ctrlBaseImage.cpp

@@ -20,13 +20,44 @@ Rect ctrlBaseImage::GetImageRect() const
     return Rect(-img_->GetOrigin(), img_->GetSize());
 }
 
-void ctrlBaseImage::DrawImage(const DrawPoint& pos) const
+void ctrlBaseImage::DrawImage(const Rect& dstArea) const
 {
-    DrawImage(pos, modulationColor_);
+    DrawImage(dstArea, modulationColor_);
 }
 
-void ctrlBaseImage::DrawImage(const DrawPoint& pos, unsigned color) const
+void ctrlBaseImage::DrawImage(const Rect& dstArea, unsigned color) const
 {
-    if(img_)
-        img_->DrawFull(pos, color);
+    if(img_ == nullptr)
+        return;
+
+    auto dst = dstArea;
+    auto imageSize = img_->GetSize();
+    auto dstSize = dstArea.getSize();
+    Rect srcArea = Rect(DrawPoint::all(0), imageSize);
+
+    if(imageSize.x > dstSize.x)
+    {
+        auto halfDelta = (imageSize.x - dstSize.x) / 2;
+        srcArea.left += halfDelta;
+        srcArea.right -= halfDelta;
+    } else if(imageSize.x < dstSize.x)
+    {
+        auto halfDelta = (dstSize.x - imageSize.x) / 2;
+        dst.left += halfDelta;
+        dst.right -= halfDelta;
+    }
+
+    if(imageSize.y > dstSize.y)
+    {
+        auto halfDelta = (imageSize.y - dstSize.y) / 2;
+        srcArea.top += halfDelta;
+        srcArea.bottom -= halfDelta;
+    } else if(imageSize.y < dstSize.y)
+    {
+        auto halfDelta = (dstSize.y - imageSize.y) / 2;
+        dst.top += halfDelta;
+        dst.bottom -= halfDelta;
+    }
+
+    img_->Draw(dst, srcArea, color);
 }

libs/s25main/controls/ctrlBaseImage.h

@@ -24,8 +24,8 @@ class ctrlBaseImage
     /// Swap the images of those controls
     void SwapImage(ctrlBaseImage& other);
     Rect GetImageRect() const;
-    void DrawImage(const DrawPoint& pos) const;
-    void DrawImage(const DrawPoint& pos, unsigned color) const;
+    void DrawImage(const Rect& dstArea) const;
+    void DrawImage(const Rect& dstArea, unsigned color) const;
 
 private:
     ITexture* img_;

libs/s25main/controls/ctrlImage.cpp

@@ -17,7 +17,7 @@ ctrlImage::~ctrlImage() = default;
  */
 void ctrlImage::Draw_()
 {
-    DrawImage(GetDrawPos());
+    DrawImage(Rect(GetDrawPos(), GetImageRect().getSize()));
 }
 
 bool ctrlImage::Msg_MouseMove(const MouseCoords& mc)

libs/s25main/controls/ctrlImageButton.cpp

@@ -11,11 +11,18 @@ ctrlImageButton::ctrlImageButton(Window* parent, unsigned id, const DrawPoint& p
 
 void ctrlImageButton::DrawContent() const
 {
-    DrawPoint pos = GetDrawPos() + DrawPoint(GetSize()) / 2;
+    DrawPoint pos = GetDrawPos() - GetImageRect().getOrigin() + DrawPoint::all(2);
+    Extent size = GetSize() - Extent::all(4);
+
     if((state == ButtonState::Pressed || isChecked) && isEnabled)
+    {
         pos += DrawPoint::all(2);
+        size -= Extent::all(2);
+    }
+
+    Rect drawRect(pos, size);
     if(!isEnabled && GetModulationColor() == COLOR_WHITE)
-        DrawImage(pos, 0xFF555555);
+        DrawImage(drawRect, 0xFF555555);
     else
-        DrawImage(pos);
+        DrawImage(drawRect);
 }