Removed bugging cancel button from npc dialog and fixed npc sprites.

2 files changed, 20 insertions, 11 deletions

diff --git a/src/gui/npc.cpp b/src/gui/npc.cpp
index 95180356..fbb55d65 100644
--- a/src/gui/npc.cpp
+++ b/src/gui/npc.cpp
@@ -33,24 +33,27 @@ NpcListDialog::NpcListDialog(gcn::Container *parent):
     itemList = new ListBox(this);
     scrollArea = new ScrollArea(itemList);
     okButton = new Button("OK");
-    cancelButton = new Button("Cancel");
+    //cancelButton = new Button("Cancel");
 
     setSize(260, 175);
-    scrollArea->setDimension(gcn::Rectangle(5, 5, 250, 130));
-    okButton->setPosition(180, 145);
-    cancelButton->setPosition(208, 145);
+    scrollArea->setDimension(gcn::Rectangle(
+                5, 5, 250, 160 - okButton->getHeight()));
+    okButton->setPosition(
+            260 - 5 - okButton->getWidth(),
+            175 - 5 - okButton->getHeight());
+    //cancelButton->setPosition(208, 145);
 
     itemList->setEventId("item");
     okButton->setEventId("ok");
-    cancelButton->setEventId("cancel");
+    //cancelButton->setEventId("cancel");
 
     itemList->addActionListener(this);
     okButton->addActionListener(this);
-    cancelButton->addActionListener(this);
+    //cancelButton->addActionListener(this);
 
     add(scrollArea);
     add(okButton);
-    add(cancelButton);
+    //add(cancelButton);
 
     setLocationRelativeTo(getParent());
 }
@@ -58,7 +61,7 @@ NpcListDialog::NpcListDialog(gcn::Container *parent):
 NpcListDialog::~NpcListDialog()
 {
     delete okButton;
-    delete cancelButton;
+    //delete cancelButton;
     delete itemList;
     delete scrollArea;
 }
@@ -105,8 +108,11 @@ void NpcListDialog::action(const std::string& eventId)
             setVisible(false);
             reset();
         }
-    } else if (eventId == "cancel") {
+    }
+    /*
+    else if (eventId == "cancel") {
         setVisible(false);
         reset();
     }
+    */
 }
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index dc70927c..f86f45e9 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -36,8 +36,11 @@ NpcTextDialog::NpcTextDialog(gcn::Container *parent):
     okButton = new Button("OK");
 
     setSize(260, 175);
-    scrollArea->setDimension(gcn::Rectangle(5, 5, 250, 130));
-    okButton->setPosition(260 - 10 - okButton->getWidth(), 145);
+    scrollArea->setDimension(gcn::Rectangle(
+                5, 5, 250, 160 - okButton->getHeight()));
+    okButton->setPosition(
+            260 - 5 - okButton->getWidth(),
+            175 - 5 - okButton->getHeight());
 
     okButton->setEventId("ok");
     okButton->addActionListener(this);