summaryrefslogtreecommitdiff
path: root/src/gui/equipmentwindow.cpp
AgeCommit message (Collapse)AuthorFilesLines
2009-02-18Introduced a toLower method and grouped string utilsBjørn Lindeijer1-1/+1
The string utility methods are now grouped together in the stringutils.h header. Also, a toLower method was added for convenience.
2009-02-17Got rid of const where it does not make much senseBjørn Lindeijer1-1/+1
It's not that useful to make variables that are passed by value const. In the declaration it is even completely ignored.
2009-02-15Merge branch 'aethyra/master'Bjørn Lindeijer1-2/+0
2009-02-15Removed unnecessary parenthesis at constructorsBjørn Lindeijer1-1/+1
When not passing any parameters to constructors, there is no reason for using parenthesis.
2009-02-15Deleted some unneeded delete statements.Ira Rice1-2/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
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-09Mostly whitespace fixesBjørn Lindeijer1-1/+1
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-09Merged with Aethyra master as of 2009-02-09Bjørn Lindeijer1-13/+81
Conflicts: A lot of files...
2009-02-09Mostly whitespace fixesBjørn Lindeijer1-1/+1
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-07Some more include cleanups.Ira Rice1-1/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Simplified equipment window initialization, since only the local playerIra Rice1-2/+2
has an inventory or an equipment. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Got rid of a few dangling pointers.Ira Rice1-0/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Forgot to check left clicking, as I assumed that it wouldn't break usingIra Rice1-4/+10
the same lookup code. This fixes left clicking on the last commit. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Added a right click popup menu, and item popups to the equipment window.Ira Rice1-9/+70
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Fixed the number of arrows from drawing in red when the shirt isIra Rice1-0/+1
selected in the equipment window. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Little bit of include cleanups.Ira Rice1-5/+6
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Created a new equipment screen, which is loosely related to theIra Rice1-27/+114
equipment screen on TMW's mainline client. Also fixed up the player box so that it can be used in game as well, which could potentially be useful in the future for making future equipment dialog changes. Signed-off-by: Ira Rice <irarice@gmail.com>
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-06Added support for internationalizationIra Rice1-1/+3
Merged from the mainline client. Originally implemented by Guillaume Melquiond, starting with commit 1828eee6a6d91fd385ad1e69d93044516493aa91. Conflicts: INSTALL configure.ac src/Makefile.am src/gui/buy.cpp src/gui/confirm_dialog.cpp src/gui/inventorywindow.cpp src/gui/login.cpp src/gui/menuwindow.cpp src/gui/minimap.cpp src/gui/ok_dialog.cpp src/gui/popupmenu.cpp src/gui/register.cpp src/gui/sell.cpp src/gui/setup.cpp src/gui/setup_video.cpp Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-07Fixed inconsistency in default window sizesBjørn Lindeijer1-1/+1
The default window sizes were all too small, since they were specified in content size. On pressing "Reset Windows", the sizes would be interpreted as such and apply alright. The inconsistency is now removed, and the default window sizes are always the size of the whole widget now, not just the contents. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2008-12-07Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'Ira Rice1-3/+5
Conflicts: AUTHORS CMakeLists.txt ChangeLog INSTALL README aethyra.cbp configure.ac data/help/changes.txt data/help/commands.txt data/help/header.txt data/help/support.txt src/Makefile.am src/aethyra.rc src/being.cpp src/being.h src/equipment.cpp src/equipment.h src/floor_item.h src/game.cpp src/gui/buddywindow.cpp src/gui/char_select.cpp src/gui/char_server.cpp src/gui/chat.cpp src/gui/chat.h src/gui/equipmentwindow.cpp src/gui/equipmentwindow.h src/gui/gui.cpp src/gui/inventorywindow.cpp src/gui/inventorywindow.h src/gui/itemcontainer.cpp src/gui/itemcontainer.h src/gui/minimap.cpp src/gui/ministatus.cpp src/gui/newskill.cpp src/gui/npc_text.cpp src/gui/npclistdialog.h src/gui/ok_dialog.cpp src/gui/setup_video.cpp src/gui/skill.cpp src/gui/skill.h src/gui/status.h src/gui/table_model.h src/gui/updatewindow.cpp src/gui/viewport.cpp src/inventory.cpp src/inventory.h src/keyboardconfig.cpp src/keyboardconfig.h src/localplayer.cpp src/localplayer.h src/logindata.h src/main.cpp src/map.cpp src/monster.cpp src/monster.h src/net/beinghandler.cpp src/net/beinghandler.h src/net/buysellhandler.cpp src/net/equipmenthandler.cpp src/net/loginhandler.cpp src/net/loginhandler.h src/net/network.h src/net/npchandler.cpp src/net/playerhandler.cpp src/net/protocol.h src/net/tradehandler.cpp src/npc.cpp src/npc.h src/particleemitter.cpp src/particleemitterprop.h src/player.cpp src/player.h src/player_relations.cpp src/resources/imageset.cpp src/resources/imageset.h src/resources/itemdb.cpp src/resources/mapreader.cpp src/resources/monsterinfo.h src/text.cpp src/text.h src/textmanager.cpp src/textmanager.h src/tileset.h src/utils/fastsqrt.h src/utils/strprintf.cpp src/winver.h tools/tmxcopy/Makefile tools/tmxcopy/base64.cpp tools/tmxcopy/base64.h tools/tmxcopy/tostring.h Signed-off-by: Ira Rice <irarice@gmail.com>
2008-11-18Pedantic fixes to the client, where I alphabetized all of the include Ira Rice1-2/+0
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-16Got rid of CVS/Subversion $Id$ markersBjørn Lindeijer1-2/+0
I don't know why we dealt with these things for so long. Did we ever get anything out of it?
2008-11-06Tweak member naming to fit conventions as a fix to r4934.Dennis Friis1-3/+3
2008-11-06Ported a patch by Peavey on TMW to keep all item pointers inside of Ira Rice1-6/+15
inventory. For us, this should get rid of the arrow crashing bug, if it still exists (been a few weeks since I've heard of it happening now).
2008-11-06Have equipment tied into player inventory instead of keeping its own list of ↵Dennis Friis1-6/+14
pointers to items. This ensures the ressource is up-to-date and avoids crashes on stale item pointers.
2008-07-18Import of client treeLloyd Bryant1-1/+1
2008-06-12Merged revisions 3738 via svnmerge from Bjørn Lindeijer1-6/+4
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk ........ r3738 | b_lindeijer | 2007-11-16 00:44:01 +0100 (Fri, 16 Nov 2007) | 3 lines Moved item icon from ItemInfo class to the Item class, so that it can be loaded on demand. Results in faster startup time and reduced memory usage. ........
2007-09-27Merged another bunch of changes from trunk to 0.0 to reduce the difference.Bjørn Lindeijer1-2/+2
2007-08-20Added close button functionality, resize cursor cues.Joshua Langley1-0/+1
2007-03-21Renamed Spriteset to ImageSet.Bjørn Lindeijer1-1/+0
2006-09-03Introduced SelectionListener to fix updating problem in inventory windowBjørn Lindeijer1-2/+2
(should also be used to fix similar problem in trade, buy and sell dialogs). Made the ItemInfo be passed around as a reference instead of a pointer, since it is never NULL.
2006-08-17the item icons are now stored in different files with more descriptive namesPhilipp Sehmisch1-7/+2
2006-07-24Implemented caching of spritesets, including a lot of cleanups to the newBjørn Lindeijer1-4/+3
animation system. Action now refers to the Spriteset directly and AnimatedSprite refers to the current Action directly instead of using the std::map with a std::string constantly. Some methods and parameters are marked as const. The READ_PROP macro was replaced by static methods. Warnings are logged when unnamed actions are defined or when actions refer to undefined imagesets. Code is more tolerant towards missing actions.
2006-06-27Equipment window now show all the slots, and adapted visible shirts to head ↵Eugenio Favalli1-2/+2
(middle) equipments.
2006-03-19Unreverted latest change by Doener due to my lack of proper communication ↵Eugenio Favalli1-4/+3
abilities.
2006-03-19Reverted changeset r2269 (toString) as requested by ElvenProgrammer.Björn Steinbrink1-3/+4
2006-03-18Added a toString conversion function.Björn Steinbrink1-4/+3
2006-03-16A bunch of cosmetic changes.Björn Steinbrink1-4/+4
2006-03-09Made all class members named like mClassMember.Björn Steinbrink1-5/+5
2006-03-09Added Spriteset::get() and Spriteset::size() to hide the member vector and ↵Björn Steinbrink1-2/+2
remove the weird mySpriteset->spriteset stuff.
2006-01-22Merged NETWORK branch (includes BEING_OVERHAUL).Björn Steinbrink1-5/+4
2005-10-16Use the ResourceManager to get spritesets.Björn Steinbrink1-6/+3
2005-10-09* Made Sprite into an interface implemented by both FloorItem and Being, whichBjørn Lindeijer1-5/+0
hook themselves into the map on construction. The improved fringe layer is working as expected now. * Made sure TMW compiles without warnings even when using "-Wconversion -Wshadow -Wcast-qual -Wwrite-strings -ansi -pedantic", lots of cleanups. * Added two new small tilesets that contain the desert tiles that are twice and three times the height of a normal tile. One well in new_3-1 has been converted to use the new double tiles for testing purposes.
2005-10-04Move to top the requested windows. Also corrected the default win pos for ↵Yohann Ferreira1-1/+1
inventory and equipment.
2005-09-29Improved a lot windows reset to default size and pos. Also corrected a few ↵Yohann Ferreira1-2/+3
the default win position. And moved the setposition from game to each win, to clarify the code.
2005-09-28Save and load X, Y, Height, and Width to useful wins.Yohann Ferreira1-1/+1
2005-09-28Added window internal name to every window. Useful to later get and save X, ↵Yohann Ferreira1-0/+1
Y, Height, and Width of these wins.
2005-09-23Merged most of the changes in biggeruniverse's second memory cleanup patch.Bjørn Lindeijer1-0/+2
2005-08-25Made our drawImage() method respect the clip area from the guichan graphics ↵Björn Steinbrink1-6/+2
part. Removed some (now) obsolete code. Fixed compilation errors.