Merge pull request #1612

pull/389/head
scrawl 7 years ago
commit 56613d817e
No known key found for this signature in database
GPG Key ID: 2E6CC3676024C402

@ -1,5 +1,7 @@
#include "companionwindow.hpp"
#include <cmath>
#include <MyGUI_InputManager.h>
#include "../mwbase/environment.hpp"
@ -129,7 +131,7 @@ void CompanionWindow::updateEncumbranceBar()
return;
float capacity = mPtr.getClass().getCapacity(mPtr);
float encumbrance = mPtr.getClass().getEncumbrance(mPtr);
mEncumbranceBar->setValue(static_cast<int>(encumbrance), static_cast<int>(capacity));
mEncumbranceBar->setValue(std::ceil(encumbrance), static_cast<int>(capacity));
if (mModel && mModel->hasProfit(mPtr))
{

@ -1,5 +1,6 @@
#include "inventorywindow.hpp"
#include <cmath>
#include <stdexcept>
#include <MyGUI_Window.h>
@ -598,7 +599,7 @@ namespace MWGui
float capacity = player.getClass().getCapacity(player);
float encumbrance = player.getClass().getEncumbrance(player);
mTradeModel->adjustEncumbrance(encumbrance);
mEncumbranceBar->setValue(static_cast<int>(encumbrance), static_cast<int>(capacity));
mEncumbranceBar->setValue(std::ceil(encumbrance), static_cast<int>(capacity));
}
void InventoryWindow::onFrame(float dt)

Loading…
Cancel
Save