summaryrefslogtreecommitdiff
path: root/src/gui
AgeCommit message (Collapse)AuthorFilesLines
2009-03-05Removed a check I added in the previous commit which isn't necessary.Ira Rice1-9/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-05Got rid of Sint{8,16,32} and Uint32 for being IDBjørn Lindeijer4-29/+42
Using unsigned rarely makes sense, especially when the server doesn't use it either. Other uses of unsigned should be reviewed. In all other cases, int is the fastest integer type on any architecture. Using 8 or 16 bits can basically only be a memory optimization.
2009-03-06Microoptimization in compile speedBjørn Lindeijer2-4/+5
No need to include localplayer.h from inventorywindow.h
2009-03-06Got rid of Sint{8,16,32} and Uint32 for being IDBjørn Lindeijer1-3/+1
Using unsigned rarely makes sense, especially when the server doesn't use it either. Other uses of unsigned should be reviewed. In all other cases, int is the fastest integer type on any architecture. Using 8 or 16 bits can basically only be a memory optimization.
2009-02-28Allow chatting while talking to NPCsJared Adams2-2/+10
2009-02-26Don't clear current NPC earlyJared Adams3-5/+0
2009-02-26Merge branch 'aethyra/master'Bjørn Lindeijer23-96/+215
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-26Fixed an error in shoplistboxes as identified by Octalot.Ira Rice8-22/+11
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-25Fix NPC handling to not need a handle on the NPCIra Rice10-34/+102
Loosely based on TMW commit f04a8713ffc83db8b3dc4a472b28aad25a2b2bd1 Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-25Prevent duplicate NPC talking when using keyboardJared Adams1-0/+1
Based on commit a1e483913672e55704e8fbafeff5ea0ccc0c9b07 from Aethyra.
2009-02-25Fix NPC handling to not need a handle on the NPCJared Adams12-28/+90
The Being ID is used instead, as that is all that was ever really needed.
2009-02-25Make sure that all dialogs are cleared on player death, not just the NPCIra Rice4-0/+12
text dialog. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-25Fixed up NPC list dialogs to be navigatable by keyboard (scrollingIra Rice7-13/+134
through the list requires the use of the mouse wheel at the moment), fixed wrapping behavior for wrapping around lists to actually wrap around lists properly, and placed a few checks for current_npc where they were assumed before which could cause the client to hang or crash in case the NPC is no longer around. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-24Cleaned up some code, as well as removed redundant talk client requestingIra Rice7-30/+46
(which would happen from using the keyboard instead of the mouse). Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-24Small dialog visibility fixJared Adams6-0/+27
Basically ensures that the NPC text dialog is visible before making NPC input dialogs visible
2009-02-24Send a next dialog packet when ending interactionJared Adams1-0/+1
Server seems to want it in some cases
2009-02-24Fixed compile warningsBjørn Lindeijer3-7/+7
Order of initialization and suggested parenthesis.
2009-02-23Allow to sell non-stackable items like stackablesMajin Sniper3-25/+118
Make it possible to sell non-stackable items all at once by introducing "Duplicate Items" and a Shop that can handle them. Also fix a trivial bug to correctly preview you money while selling.
2009-02-23Allow to sell non-stackable items like stackablesMajin Sniper3-26/+119
Make it possible to sell non-stackable items all at once by introducing "Duplicate Items" and a Shop that can handle them. Also fix a trivial bug to correctly preview you money while selling.
2009-02-23Hide the buy/sell dialogs when there is no NPCJared Adams6-0/+36
2009-02-23End NPC interraction when canceling list inpuJared Adams1-0/+1
2009-02-23Fix Job EXP bar codeJared Adams1-1/+1
2009-02-23Clear text from NpcTextDialog when character diesJared Adams1-0/+5
Also hid the integer and string dialogs
2009-02-22Highlight unbuyable items in redJared Adams1-8/+7
2009-02-22Fixed another Particle/Paricle mismatch in a commentPhilipp Sehmisch1-1/+1
2009-02-22Make progressbars more readableJared Adams1-2/+2
2009-02-22Allow percentage for exp displaysJared Adams2-9/+25
2009-02-22Fixed another Particle/Paricle mismatch in a commentPhilipp Sehmisch1-1/+1
2009-02-22Renamed InfoParicleFont to InfoParticleFont (typo?)Philipp Sehmisch2-3/+3
2009-02-21Fix bug when maximum level is reachedJared Adams3-62/+77
Also centralize code for updating the various progress bars for player status.
2009-02-20Fix debug window to show correct mouse coordinatesJared Adams1-2/+2
2009-02-20Fix debug window to show correct mouse coordinatesJared Adams1-2/+2
2009-02-20Fixed some lines from cutting off in English (which would carry over toIra Rice1-4/+4
other languages as well). Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-20Removed the last of the image particle guichan fonts.Ira Rice2-31/+4
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-20Added a pickup notification as particle effect. Also make a ui option to ↵Majin Sniper6-8/+53
enable/disable this effect (default is off) and another option to disable the pickup notification in the chat log (default is on).
2009-02-20Restore old middle click behaviorJared Adams1-1/+2
2009-02-19Added a pickup notification as particle effect. Also make a ui option to ↵Majin Sniper6-8/+53
enable/disable this effect (default is off) and another option to disable the pickup notification in the chat log (default is on).
2009-02-18Introduced a toLower method and grouped string utilsBjørn Lindeijer26-44/+31
The string utility methods are now grouped together in the stringutils.h header. Also, a toLower method was added for convenience.
2009-02-18Move check to a more appropriate placeJared Adams1-2/+2
It shouldn't have been moved to where it was in the first place, as it doesn't have any effecxt on that code, but was originally on the other code (where it is now).
2009-02-18Move check to a more appropriate placeJared Adams1-2/+2
It shouldn't have been moved to where it was in the first place, as it doesn't have any effecxt on that code, but was originally on the other code (where it is now).
2009-02-18Introduced a toLower method and grouped string utilsBjørn Lindeijer26-44/+31
The string utility methods are now grouped together in the stringutils.h header. Also, a toLower method was added for convenience.
2009-02-18Centralize current_npc cleanupJared Adams4-16/+12
2009-02-17Fix small bug in character select dialogJared Adams1-1/+1
That check can probably be removed entirely, as it's inappropriate.
2009-02-17Show money for initial character in char selectJared Adams1-0/+1
2009-02-17Fix small bug in character select dialogJared Adams1-1/+1
That check can probably be removed entirely, as it's inappropriate.
2009-02-17Reduce NpcTextDialog to one actionJared Adams2-14/+29
This allows external classes (like game.cpp) to send actions to it without them having to know about it's internal state.
2009-02-17Got rid of const where it does not make much senseBjørn Lindeijer8-17/+17
It's not that useful to make variables that are passed by value const. In the declaration it is even completely ignored.
2009-02-17Merge branch 'aethyra/master'Bjørn Lindeijer4-18/+33
Conflicts: src/gui/npc_text.cpp src/gui/npc_text.h src/gui/npcintegerdialog.cpp src/gui/npclistdialog.cpp src/gui/npcstringdialog.cpp src/net/npchandler.cpp src/npc.cpp
2009-02-16Moved location of trim checking, since it really should be done afterIra Rice1-6/+3
the recipient nickname is parsed out. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-16Trim whitespace from the beginning and end of whispers, as well asIra Rice1-0/+21
disallowing empty whispers and whispers to yourself, since both of those cases cause the server to report back stating that the player wasn't found (even if they are there, like yourself). Signed-off-by: Ira Rice <irarice@gmail.com>