diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-03-25 12:18:43 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-03-25 12:42:43 -0600 |
| commit | f781215c6401343d287798b58b08183e71ef57e3 (patch) | |
| tree | b07001f8ee295c4ba8617c5168805269530bd9d1 /src/game.cpp | |
| parent | bf6cb46d9b06b06470efd5ad3ebae7e274f6906f (diff) | |
| download | mana-f781215c6401343d287798b58b08183e71ef57e3.tar.gz mana-f781215c6401343d287798b58b08183e71ef57e3.tar.bz2 mana-f781215c6401343d287798b58b08183e71ef57e3.tar.xz mana-f781215c6401343d287798b58b08183e71ef57e3.zip | |
Merge StorageWindow into InventoryWindow
Reviewed-by: Chuck Miller
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/game.cpp b/src/game.cpp index 0f45d436..f2ad6109 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -60,7 +60,6 @@ #include "gui/setup.h" #include "gui/socialwindow.h" #include "gui/specialswindow.h" -#include "gui/storagewindow.h" #include "gui/skilldialog.h" #include "gui/statuswindow.h" #include "gui/textdialog.h" @@ -156,7 +155,7 @@ static void createGuiWindows() equipmentWindow = new EquipmentWindow(player_node->mEquipment.get()); statusWindow = new StatusWindow; miniStatusWindow = new MiniStatusWindow; - inventoryWindow = new InventoryWindow; + inventoryWindow = new InventoryWindow(player_node->getInventory(), true); skillDialog = new SkillDialog; minimap = new Minimap; helpWindow = new HelpWindow; |