diff options
| -rw-r--r-- | src/graphic/graphic.cpp | 2 | ||||
| -rw-r--r-- | src/gui/npc.cpp | 24 | ||||
| -rw-r--r-- | src/gui/npc_text.cpp | 7 | ||||
| -rw-r--r-- | src/net/network.cpp | 4 | ||||
| -rw-r--r-- | src/net/network.h | 8 |
5 files changed, 28 insertions, 17 deletions
diff --git a/src/graphic/graphic.cpp b/src/graphic/graphic.cpp index dd5df45b..aa2d3407 100644 --- a/src/graphic/graphic.cpp +++ b/src/graphic/graphic.cpp @@ -197,7 +197,7 @@ GraphicEngine::GraphicEngine() { BITMAP *npcbmp = load_bitmap("data/graphic/npcset.bmp", NULL); if (!npcbmp) error("Unable to load npcset.bmp"); - npcset = new Spriteset(npcbmp, 80, 50, 0, 0); + npcset = new Spriteset(npcbmp, 50, 80, 0, 0); BITMAP *emotionbmp = load_bitmap("data/graphic/emotionset.bmp", NULL); if (!emotionbmp) error("Unable to load emotionset.bmp"); 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); diff --git a/src/net/network.cpp b/src/net/network.cpp index 993abbc7..0162d246 100644 --- a/src/net/network.cpp +++ b/src/net/network.cpp @@ -17,6 +17,8 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * $Id$ */ #include "network.h" @@ -171,5 +173,3 @@ void flush() { } else RFIFOSET(ret); // Set size of available data to read } } - - diff --git a/src/net/network.h b/src/net/network.h index 937f9c61..db342f91 100644 --- a/src/net/network.h +++ b/src/net/network.h @@ -17,15 +17,17 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * $Id$ */ +#ifndef _TMW_NETWORK_H +#define _TMW_NETWORK_H + #ifdef WIN32 #pragma warning (disable:4312) #endif -#ifndef _NETWORK_H -#define _NETWORK_H - #ifdef WIN32 #include <allegro.h> #include <winalleg.h> |