summaryrefslogtreecommitdiff
path: root/src/gui/itemcontainer.h
AgeCommit message (Collapse)AuthorFilesLines
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-09Merged with Aethyra master as of 2009-02-09Bjørn Lindeijer1-2/+0
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-09Merged with Aethyra master as of 2009-01-27Bjørn Lindeijer1-6/+26
Conflicts: Almost everywhere.
2009-02-04Went through the gui folder and revised the include statements to notIra Rice1-2/+0
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-26Little bit of include cleanups.Ira Rice1-2/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-25Removed the TMW branding from header guardsBjørn Lindeijer1-2/+2
2009-01-25Removed the TMW branding from header guardsBjørn Lindeijer1-2/+2
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-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-20Added WoW style item adding to chat window. Right click, then leftDavid Athay1-1/+1
clicking on add to chat to put the item in the chat input. Left click the item link to show a popup description, and click the link again to remove the popup.
2009-01-15Fixed Item Popup window transparency (double setting of the skin)Ira Rice1-2/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-15A little bit of code cleanup/simplification.Ira Rice1-2/+2
TODO: Figure out how the itempopup transparency is broken and fix it (broken on code import). Best guess would be that the window is attached to a widget which is then attached to a window, causing a break in updates to the transparency code. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-15Integrated the ItemPopup class from Legends of Mazzeroth.Ira Rice1-0/+16
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-13Code style reformattingBjørn Lindeijer1-3/+3
Got rid of "void" in functions that take no arguments and removed the newline after the return type of a method in many places.
2008-12-07Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'Ira Rice1-7/+8
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-29Imported patch that Fate made on TMW which which changes the item Ira Rice1-6/+13
container to guarantee that the inventory window always reports what the player has correctly, getting rid of the stale item references that could occur from time to time.
2008-11-28Remember last equipped item ID so that we jump to/re-find an item of the ↵Fate1-3/+9
same ID whenever we lose the current one
2008-11-28Changed inventory container protocol to guarantee that we have no stale item ↵Fate1-3/+3
references lying around
2008-11-18Pedantic fixes to the client, where I alphabetized all of the include Ira Rice1-4/+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-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-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-09-12Fixed /where, added /cast for heal and gather, some changes to inventory to ↵Lloyd Bryant1-1/+2
support storage
2008-07-18Import of client treeLloyd Bryant1-1/+1
2008-06-12Merged revisions 3738 via svnmerge from Bjørn Lindeijer1-1/+1
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. ........
2008-04-28Properly fix problems with ItemContainer in InventoryWindow not resizingBjørn Lindeijer1-4/+13
properly since upgrade to Guichan 0.8.0.
2008-04-07Upgraded to Guichan 0.8.0 (merge from guichan-0.8 branch, except forBjørn Lindeijer1-5/+8
gcn::TabbedArea usage)
2007-01-14Upgraded to Guichan 0.6.0 (merge from guichan-0.6.0 branch).Bjørn Lindeijer1-1/+1
2006-09-03Introduced SelectionListener to fix updating problem in inventory windowBjørn Lindeijer1-1/+34
(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-2/+0
2006-03-09Made all class members named like mClassMember.Björn Steinbrink1-4/+4
2005-10-09* Made Sprite into an interface implemented by both FloorItem and Being, whichBjørn Lindeijer1-1/+1
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-08-13Huge header cleanup to reduce dependencies and compile time.Björn Steinbrink1-6/+6
2005-08-01Added code to dynamically adjust the itemcontainer size.Björn Steinbrink1-0/+7
2005-07-18Created Inventory class. (Really) Small code simplifications and cleanups.Björn Steinbrink1-43/+3
2005-07-17Added Item and Equipment class and made the appropriate places make use of ↵Björn Steinbrink1-67/+16
them. Plus some cleanups.
2005-07-11Committed header dependencies reducing patch by DoenerBjørn Lindeijer1-1/+0
2005-06-16Fixed cutting off bottom item row of inventory in some casesBjørn Lindeijer1-0/+6
2005-05-21Numerous things:Bjørn Lindeijer1-2/+2
* Fixed two non-virtual destructor warnings showing up with GCC 4. * Fixed OpenGL inventory text drawing that broke in last commit * Removed glClear cause screen is redrawn completely anyway * Fixed updating of buttons in inventory window * Made items.xml be loaded through resource manager.
2005-05-14Mainly separating core GUI classes from game interface.Bjørn Lindeijer1-1/+1
2005-05-11another trade update: selecting items is more logical now, name and desc. ↵Jan-Fabian Humann1-1/+6
are being displayed
2005-04-19A few random changes.Bjørn Lindeijer1-26/+39
2005-04-13Now getNumberOfSlotsUsed() return the number of different items a character has.Yohann Ferreira1-1/+6
2005-04-10New selection in inventory instead of black rectangleMateusz Kaduk1-0/+2
2005-04-04starting to do the trade window, i know it's not functionable and contains a ↵Jan-Fabian Humann1-1/+6
lot of bugs but ill continue tomorrow.
2005-04-04quick fix for bug which increased item amount when warping client-sideJan-Fabian Humann1-0/+5
2005-03-04A bunch of updates:Eugenio Favalli1-0/+2
- inventory fixes - equipment fixes - graphic updates (items and monsters) - weaponary system - fixed status window
2005-02-21Updates to change log, file lists, lots of doxygen comments and small changes.Bjørn Lindeijer1-2/+0
2005-02-20Finally equipment! Sometimes it works :PEugenio Favalli1-0/+10
2005-02-11Working on equipmentEugenio Favalli1-1/+4