summaryrefslogtreecommitdiff
path: root/src/engine.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine.cpp')
-rw-r--r--src/engine.cpp127
1 files changed, 3 insertions, 124 deletions
diff --git a/src/engine.cpp b/src/engine.cpp
index 4c91a688..72d90a61 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -30,7 +30,6 @@
#include <guichan/widgets/label.hpp>
#include "being.h"
-#include "configuration.h"
#include "floor_item.h"
#include "game.h"
#include "graphics.h"
@@ -41,25 +40,10 @@
#include "graphic/spriteset.h"
-//#include "gui/buddywindow.h"
-#include "gui/buy.h"
-#include "gui/buysell.h"
-#include "gui/chargedialog.h"
-#include "gui/chat.h"
-#include "gui/equipmentwindow.h"
#include "gui/gui.h"
-#include "gui/help.h"
-#include "gui/inventorywindow.h"
#include "gui/minimap.h"
-#include "gui/npc.h"
-#include "gui/npc_text.h"
-#include "gui/popupmenu.h"
-#include "gui/sell.h"
-#include "gui/setup.h"
-#include "gui/skill.h"
#include "gui/stats.h"
#include "gui/status.h"
-#include "gui/trade.h"
#include "gui/windowcontainer.h"
#include "resources/image.h"
@@ -67,8 +51,9 @@
#include "resources/itemmanager.h"
#include "resources/resourcemanager.h"
-extern Being* autoTarget;
-extern Graphics* graphics;
+extern Being *autoTarget;
+extern Graphics *graphics;
+extern Minimap *minimap;
extern Spriteset *hairset, *playerset;
char itemCurrenyQ[10] = "0";
@@ -76,25 +61,6 @@ int camera_x, camera_y;
gcn::Label *debugInfo;
-ChatWindow *chatWindow;
-StatusWindow *statusWindow;
-BuyDialog *buyDialog;
-SellDialog *sellDialog;
-BuySellDialog *buySellDialog;
-InventoryWindow *inventoryWindow;
-NpcListDialog *npcListDialog;
-NpcTextDialog *npcTextDialog;
-SkillDialog *skillDialog;
-//NewSkillDialog *newSkillWindow;
-StatsWindow *statsWindow;
-Setup* setupWindow;
-Minimap *minimap;
-EquipmentWindow *equipmentWindow;
-ChargeDialog *chargeDialog;
-TradeWindow *tradeWindow;
-//BuddyWindow *buddyWindow;
-HelpWindow *helpWindow;
-PopupMenu *popupMenu;
std::map<int, Spriteset*> monsterset;
ItemManager *itemDb; /**< Item database object */
@@ -181,72 +147,6 @@ Engine::Engine():
// (Well, the BasicContainer interface isn't that much more useful... ;)
dynamic_cast<WindowContainer*>(gui->getTop())->add(debugInfo);
- // Create dialogs
- chatWindow = new ChatWindow(
- config.getValue("homeDir", "") + std::string("/chatlog.txt"));
- statusWindow = new StatusWindow();
- buyDialog = new BuyDialog();
- sellDialog = new SellDialog();
- buySellDialog = new BuySellDialog();
- inventoryWindow = new InventoryWindow();
- npcTextDialog = new NpcTextDialog();
- npcListDialog = new NpcListDialog();
- skillDialog = new SkillDialog();
- //newSkillWindow = new NewSkillDialog();
- statsWindow = new StatsWindow();
- setupWindow = new Setup();
- minimap = new Minimap();
- equipmentWindow = new EquipmentWindow();
- chargeDialog = new ChargeDialog();
- tradeWindow = new TradeWindow();
- //buddyWindow = new BuddyWindow();
- helpWindow = new HelpWindow();
- popupMenu = new PopupMenu();
-
- // Initialize window posisitons
- int screenW = graphics->getWidth();
- int screenH = graphics->getHeight();
-
- chatWindow->setPosition(0, screenH - chatWindow->getHeight());
- statusWindow->setPosition(screenW - statusWindow->getWidth() - 5, 5);
- inventoryWindow->setPosition(screenW - statusWindow->getWidth() -
- inventoryWindow->getWidth() - 10, 5);
- statsWindow->setPosition(
- screenW - 5 - statsWindow->getWidth(),
- statusWindow->getHeight() + 20);
- chargeDialog->setPosition(
- screenW - 5 - chargeDialog->getWidth(),
- screenH - chargeDialog->getHeight() - 15);
- tradeWindow->setPosition(screenW - statusWindow->getWidth() -
- tradeWindow->getWidth() - 10,
- inventoryWindow->getY() + inventoryWindow->getHeight());
- /*buddyWindow->setPosition(10,
- minimap->getHeight() + 30);*/
- equipmentWindow->setPosition(5,140);
-
- // Set initial window visibility
- chatWindow->setVisible(true);
- statusWindow->setVisible(true);
- buyDialog->setVisible(false);
- sellDialog->setVisible(false);
- buySellDialog->setVisible(false);
- inventoryWindow->setVisible(false);
- npcTextDialog->setVisible(false);
- npcListDialog->setVisible(false);
- skillDialog->setVisible(false);
- //newSkillWindow->setVisible(false);
- statsWindow->setVisible(false);
- setupWindow->setVisible(false);
- equipmentWindow->setVisible(false);
- chargeDialog->setVisible(false);
- tradeWindow->setVisible(false);
- //buddyWindow->setVisible(false);
- helpWindow->setVisible(false);
- popupMenu->setVisible(false);
-
- // Do not focus any text field
- gui->focusNone();
-
// Load the sprite sets
ResourceManager *resman = ResourceManager::getInstance();
Image *npcbmp = resman->getImage("graphics/sprites/npcs.png");
@@ -274,27 +174,6 @@ Engine::Engine():
Engine::~Engine()
{
- // Delete windows
- delete chatWindow;
- delete statusWindow;
- delete buyDialog;
- delete sellDialog;
- delete buySellDialog;
- delete inventoryWindow;
- delete npcListDialog;
- delete npcTextDialog;
- delete skillDialog;
- delete statsWindow;
- delete setupWindow;
- delete minimap;
- delete equipmentWindow;
- delete chargeDialog;
- //delete newSkillWindow;
- delete tradeWindow;
- //delete buddyWindow;
- delete helpWindow;
- delete popupMenu;
-
// Delete sprite sets
//delete monsterset;
delete npcset;