summaryrefslogtreecommitdiff
path: root/src/gui/npc_text.h
AgeCommit message (Collapse)AuthorFilesLines
2009-03-25Merge branch 'eathena/master'Bjørn Lindeijer1-1/+32
Conflicts: A lot of files.
2009-03-23Merge branch 'aethyra/master'Bjørn Lindeijer1-0/+13
Conflicts: Many files.
2009-03-10Made it so that when windows load previous states, they are neverIra Rice1-0/+13
smaller than the minimum width and height (a check that should have been enforced in the first place), as well as modified the NPC list and text dialogs to remember where they were when they were moved or resized last. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-09Send the correct packet for the NPC close buttonJared Adams1-0/+2
Both packets do the same, but we should be explicit anyways. Also, seperate out NPC client packets.
2009-03-09Send the correct packet for the NPC close buttonJared Adams1-0/+2
Both packets do the same, but we should be explicit anyways. Also, seperate out NPC client packets.
2009-02-26Merge branch 'aethyra/master'Bjørn Lindeijer1-0/+2
Conflicts: data/graphics/images/login_wallpaper.png src/being.cpp src/beingmanager.cpp src/engine.cpp src/game.cpp src/gui/buysell.cpp src/gui/buysell.h src/gui/gui.h src/gui/npc_text.cpp src/gui/npc_text.h src/gui/npcintegerdialog.cpp src/gui/npclistdialog.cpp src/gui/npclistdialog.h src/gui/npcstringdialog.cpp src/gui/sell.cpp src/gui/shop.cpp src/gui/table.cpp src/net/beinghandler.cpp src/net/npchandler.cpp src/net/playerhandler.cpp src/npc.cpp src/npc.h src/shopitem.cpp src/shopitem.h src/utils/stringutils.cpp src/utils/stringutils.h src/utils/trim.h
2009-02-25Fix NPC handling to not need a handle on the NPCIra Rice1-2/+7
Loosely based on TMW commit f04a8713ffc83db8b3dc4a472b28aad25a2b2bd1 Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-25Fix NPC handling to not need a handle on the NPCJared Adams1-1/+7
The Being ID is used instead, as that is all that was ever really needed.
2009-02-24Cleaned up some code, as well as removed redundant talk client requestingIra Rice1-0/+2
(which would happen from using the keyboard instead of the mouse). Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-24Fixed compile warningsBjørn Lindeijer1-1/+1
Order of initialization and suggested parenthesis.
2009-02-17Reduce NpcTextDialog to one actionJared Adams1-0/+7
This allows external classes (like game.cpp) to send actions to it without them having to know about it's internal state.
2009-02-16Fixed up NPC dialogs to behave more like eAthena expects.Jared Adams1-1/+2
2009-02-16Add next/close buttons for NPCsJared Adams1-0/+5
And keep the text dialog open for the whole transaction, logging user input and keep a full record of text from the NPC (for the current transaction only).
2009-02-15Fixes some variable names to conform to naming conventionBjørn Lindeijer1-2/+1
Please do remember that member variables are prefixes with 'm', so that they are easily distinguishable.
2009-02-10Fixed header files, as well as removed the unused buddy list class (notIra Rice1-2/+3
useful since buddy lists are tracked through the player relation interface instead) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Went through the gui folder and revised the include statements to notIra Rice1-2/+1
include anything not needed by that specific widget or window. This appears to have cleaned up system performance a bit on my current setup, where it went from idling on 45% in game with opengl down to 30% now. Also moved iptostring to the tostring header, as importing all of network.h is a little overkill to use that function, and it goes along with the basic functions that are in that header file anyways. TODO: find out a way to get rid of warnings when a class doesn't use this function. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-28Moved NPC text back to using the textbox. Rationale is that the textboxIra Rice1-2/+11
code is in much better shape than the browserbox code at the moment, and that the move to using the browserbox was a bit silly, as textbox already wraps. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-25Removed the TMW branding from header guardsBjørn Lindeijer1-3/+3
2009-01-23Removed unnecessary references to The Mana World in code headersBjørn Lindeijer1-4/+4
This dates back to the old days of TMW, but the usage instructions of GPLv2 don't mention this being necessary. Since it doesn't add anything, avoid the branding in these sections.
2009-01-20Switch the NPC text dialog over to a BrowserBoxJared Adams1-13/+6
2009-01-05Made trade window resizableBjørn Lindeijer1-1/+1
Also fixed overlap between description label and the buttons and added the SDL_ttf library to the Code::Blocks project file.
2008-12-06Fixed wrapping in some cases, removed draw methodBjørn Lindeijer1-12/+4
The 'draw' method was confusingly named, and was actually for updating the GUI after a resize. Its functionality has been merged into 'widgetResized'. The wrapping was broken in the case where text was added to the NPC dialog, cause it was added to an already wrapped string, causing the wrapping to become permanent. Sorry for all the reformatting. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2008-11-18Pedantic fixes to the client, where I alphabetized all of the include Ira Rice1-3/+2
statements, as well as removing the new skill dialog, which we do not, nor will we use (if we do, it'd be a new one that we'd make). WARNING!!! This, and all other previous builds have a linker error for the Gnome libraries version 4.3.2 on my setup. It's assumed that this is also the case for other users of this library as well. I'm currently assuming that there's a bug in the compiler itself, and will look into reporting this, but in the mean time, it doesn't build for these users, unfortunately. Sorry about this.
2008-11-01Made NPC dialogues resizeable.Ira Rice1-0/+18
2008-10-03Made a new Windows binary, as well as fix some files to make the Windows Ira Rice1-0/+2
build work (although there might be a bit too many guichanfwd.h references. But that's ok. I'm too lazy to track down which ones are necessary and which ones aren't at the moment).
2008-07-18Import of client treeLloyd Bryant1-1/+1
2008-04-16Restored the text wrapping in TextBox, since it was based on overriding aBjørn Lindeijer1-3/+4
method that is no longer virtual in Guichan 0.8.0 (gcn::TextBox::setText()).
2007-01-14Upgraded to Guichan 0.6.0 (merge from guichan-0.6.0 branch).Bjørn Lindeijer1-1/+1
2006-08-13Merged Guichan 0.5.0 support from guichan-0.5.0 branch, plus several updatesBjørn Lindeijer1-1/+1
from the 0.1.0 branch.
2006-01-22Merged NETWORK branch (includes BEING_OVERHAUL).Björn Steinbrink1-4/+1
2006-01-05Remove some useless code.Björn Steinbrink1-2/+0
2005-10-20Added garbage collection to the ScrollArea class. Fixed slider not being ↵Björn Steinbrink1-5/+0
updated in the item amount box when the buttons are used.
2005-09-13Merged with SDL_NET_TEST branch.Björn Steinbrink1-5/+7
2005-08-28Prepare our source so that it'll survive a guichan header cleanup, should it ↵Björn Steinbrink1-0/+2
ever happen...
2005-08-13Huge header cleanup to reduce dependencies and compile time.Björn Steinbrink1-3/+4
2005-07-11Committed header dependencies reducing patch by DoenerBjørn Lindeijer1-0/+2
2005-05-14Mainly separating core GUI classes from game interface.Bjørn Lindeijer1-1/+1
2005-01-08Well improved window container and window widgets a bit, and made a startBjørn Lindeijer1-1/+1
on support for modal dialogs. Still some issues to work out. Tell me if you experience something unsettling.
2004-12-29Ported the npc text dialog and some other small updates.Bjørn Lindeijer1-0/+78