diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-07-19 22:05:41 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-07-19 22:30:18 -0600 |
| commit | 5141dc4a99b74358f2dd0f5f211c5069a630ce1b (patch) | |
| tree | 647cfb05d179d61759ef3679482eb204a7853d34 /src/game.cpp | |
| parent | 2e8fca7d471b4e2bf20735a0669e96722c000669 (diff) | |
| download | mana-5141dc4a99b74358f2dd0f5f211c5069a630ce1b.tar.gz mana-5141dc4a99b74358f2dd0f5f211c5069a630ce1b.tar.bz2 mana-5141dc4a99b74358f2dd0f5f211c5069a630ce1b.tar.xz mana-5141dc4a99b74358f2dd0f5f211c5069a630ce1b.zip | |
Merge StatusWindows
Also some other small merges
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game.cpp b/src/game.cpp index 306d8812..c7a1d4e7 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -63,7 +63,7 @@ #include "gui/sell.h" #include "gui/setup.h" #include "gui/skilldialog.h" -#include "gui/status.h" +#include "gui/statuswindow.h" #include "gui/trade.h" #include "gui/viewport.h" #include "gui/windowmenu.h" @@ -224,7 +224,7 @@ static void createGuiWindows() npcDialog = new NpcDialog; npcPostDialog = new NpcPostDialog; storageWindow = new StorageWindow; - statusWindow = new StatusWindow(); + statusWindow = new StatusWindow; miniStatusWindow = new MiniStatusWindow; inventoryWindow = new InventoryWindow; skillDialog = new SkillDialog; |