Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2011-07-31 18:24:01 +0000
committerStijn Buys <ingar@osirion.org>2011-07-31 18:24:01 +0000
commit45054b224d8f0f8b6d7db4bcd0b0abf6763a60ab (patch)
treec23ea79d4564037673312ea1d4cb936272c65a06 /src/client/inventorywindow.cc
parentf0cbe1d0655013d14dd4f1807ddb88789ae8d27a (diff)
Improved map window, moved the actual map widget into a seperate class.
Diffstat (limited to 'src/client/inventorywindow.cc')
-rw-r--r--src/client/inventorywindow.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/inventorywindow.cc b/src/client/inventorywindow.cc
index 604145a..cca8cc2 100644
--- a/src/client/inventorywindow.cc
+++ b/src/client/inventorywindow.cc
@@ -176,7 +176,6 @@ bool InventoryWindow::verify() const
void InventoryWindow::resize()
{
- //const float smallmargin = ui::UI::elementsize.height();
const float padding = ui::root()->font_large()->height();
const float icon_size = 24.0f; // small icons
@@ -260,6 +259,7 @@ void InventoryWindow::set_info(const core::Info *info, const int amount)
core::game()->request_info(info->id());
inventorywindow_modelview->set_modelname(info->modelname());
inventorywindow_modelnamelabel->set_text(info->name());
+ inventorywindow_modelview->set_colors(core::localplayer()->color(), core::localplayer()->color_second());
for (core::Info::Text::const_iterator it = inventorywindow_inforecord->text().begin(); it != inventorywindow_inforecord->text().end(); it++) {
inventorywindow_infotext.push_back((*it));