summaryrefslogtreecommitdiff
path: root/src/gui/npclistdialog.h
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-22 19:45:03 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-22 19:45:56 +0100
commit0c43d04b438d41c277ae80402d4b4888db1a0b64 (patch)
tree3aaeb75ecd1bcbe85decedab5f1fa426fe0411e3 /src/gui/npclistdialog.h
parenta7f5eaeb7f643658d356533a608f0f18d85b6d32 (diff)
parent401802c1d7a1b3d659bdc53a45d9a6292fc1121e (diff)
downloadmana-0c43d04b438d41c277ae80402d4b4888db1a0b64.tar.gz
mana-0c43d04b438d41c277ae80402d4b4888db1a0b64.tar.bz2
mana-0c43d04b438d41c277ae80402d4b4888db1a0b64.tar.xz
mana-0c43d04b438d41c277ae80402d4b4888db1a0b64.zip
Merged the tmwserv client with the eAthena client
This merge involved major changes on both sides, and as such took several weeks. Lots of things are expected to be broken now, however, we now have a single code base to improve and extend, which can be compiled to support either eAthena or tmwserv. In the coming months, the plan is to work towards a client that supports both eAthena and tmwserv, without needing to be recompiled. Conflicts: Everywhere!
Diffstat (limited to 'src/gui/npclistdialog.h')
-rw-r--r--src/gui/npclistdialog.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/npclistdialog.h b/src/gui/npclistdialog.h
index 57d6247a..7e37c7e6 100644
--- a/src/gui/npclistdialog.h
+++ b/src/gui/npclistdialog.h
@@ -61,6 +61,11 @@ class NpcListDialog : public Window, public gcn::ActionListener,
std::string getElementAt(int i);
/**
+ * Adds an item to the option list.
+ */
+ void addItem(const std::string &);
+
+ /**
* Fills the options list for an NPC dialog.
*
* @param itemString A string with the options separated with colons.