diff options
| author | Ira Rice <irarice@gmail.com> | 2009-01-19 21:59:59 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-01-19 21:59:59 +0100 |
| commit | 3fcd3755f5c5d23af31e081c59275ef94cb4e036 (patch) | |
| tree | d0c8e5f9d733bc68bcdd157eaad1efa5925bfac3 /src/Makefile.am | |
| parent | 59cf6979f8e0a86deb0975ef135593b207ffe34a (diff) | |
| download | mana-3fcd3755f5c5d23af31e081c59275ef94cb4e036.tar.gz mana-3fcd3755f5c5d23af31e081c59275ef94cb4e036.tar.bz2 mana-3fcd3755f5c5d23af31e081c59275ef94cb4e036.tar.xz mana-3fcd3755f5c5d23af31e081c59275ef94cb4e036.zip | |
Fixes to the NPC Integer input field
Also don't set "The Mana World" to start with.
Signed-off-by: Ira Rice <irarice@gmail.com>
(cherry picked from Aethyra commit d2b804c1a817ccdd85b4b1220bf929e9d370d774)
Conflicts:
src/game.cpp
src/gui/inttextfield.cpp
src/gui/item_amount.cpp
src/gui/textfield.h
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 97b62dd9..358b0b61 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -47,8 +47,8 @@ tmw_SOURCES = gui/widgets/layout.cpp \ gui/gui.h \ gui/help.cpp \ gui/help.h \ - gui/inttextbox.h \ - gui/inttextbox.cpp \ + gui/inttextfield.h \ + gui/inttextfield.cpp \ gui/inventorywindow.cpp \ gui/inventorywindow.h \ gui/itemcontainer.cpp \ |