From 5141dc4a99b74358f2dd0f5f211c5069a630ce1b Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Sun, 19 Jul 2009 22:05:41 -0600 Subject: Merge StatusWindows Also some other small merges --- src/game.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/game.cpp') 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; -- cgit v1.2.3-70-g09d2