summaryrefslogtreecommitdiff
path: root/src/gui/itemcontainer.cpp
AgeCommit message (Collapse)AuthorFilesLines
2009-04-06Fixed compile warning about initialization orderBjørn Lindeijer1-2/+2
Also made CMakeLists.txt consistent with Makefile.am regarding the BuySellDialog.
2009-04-06Fix a spelling errorJared Adams1-1/+1
2009-04-06Clean up and expand item equip handling in the GUIJared Adams1-12/+15
2009-03-28Make the full inventory accessible againBjørn Lindeijer1-5/+7
Was broken due to tmwserv having only 50 as opposed to 100 places in the inventory at the moment.
2009-03-27Removed unnecessary parenthesis on constructorsBjørn Lindeijer1-1/+1
2009-03-27Fixed inventory window. Not resizable though.Bjørn Lindeijer1-21/+10
Resizing of the inventory window may come back later. Also did some more code cleanups, moving defines to enums, getting rid of eAthena-specific offset handling (to be done in the network layer), etc. Mantis-issue: 666
2009-03-27Fixed include structure in resource/ directoryBjørn Lindeijer1-17/+18
There is also a new rule that trivial constructors and destructors should no longer be trivially "documented", since this just takes up space with no gain.
2009-03-25Merge branch 'eathena/master'Bjørn Lindeijer1-10/+9
Conflicts: A lot of files.
2009-03-23Merge branch 'aethyra/master'Bjørn Lindeijer1-5/+8
Conflicts: Many files.
2009-03-22Merged the tmwserv client with the eAthena clientBjørn Lindeijer1-149/+283
This merge involved major changes on both sides, and as such took several weeks. Lots of things are expected to be broken now, however, we now have a single code base to improve and extend, which can be compiled to support either eAthena or tmwserv. In the coming months, the plan is to work towards a client that supports both eAthena and tmwserv, without needing to be recompiled. Conflicts: Everywhere!
2009-03-14Commented up item popups, speech bubbles, as well as only update itemIra Rice1-3/+6
info on item change. Also fixed color updating for item shortcuts and item links, as the displayed colors wouldn't update on change on color change in the setup color dialog. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-09Add an interface for eAthena's storage systemJared Adams1-2/+2
2009-03-06Merge branch 'aethyra/master'Bjørn Lindeijer1-26/+19
Conflicts: src/being.cpp src/being.h src/floor_item.cpp src/floor_item.h src/flooritemmanager.cpp src/gui/inventorywindow.cpp src/gui/inventorywindow.h src/gui/itemcontainer.cpp src/gui/popupmenu.cpp src/net/beinghandler.cpp src/npc.cpp
2009-03-05Made some optimizations based on some profiling done by Octalot, as wellIra Rice1-23/+17
as some other optimizations that I could see that cut down on some unneeded redraws, which in turn improved frame rates slightly. Signed-off-by: Ira Rice <irarice@gmail.com>
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-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-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-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-09Merged with Aethyra master as of 2009-02-09Bjørn Lindeijer1-1/+2
Conflicts: A lot of files...
2009-02-09Merged with Aethyra master as of 2009-01-27Bjørn Lindeijer1-14/+62
Conflicts: Almost everywhere.
2009-02-04A few more pointers which weren't getting deleted.Ira Rice1-0/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Went through the gui folder and revised the include statements to notIra Rice1-1/+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-30Fixed the item container so that it displays all item captions with theIra Rice1-0/+1
default font. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Little bit of include cleanups.Ira Rice1-0/+1
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-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-20Changed item popup drawing to be based on the mouse position, not windowIra Rice1-6/+9
position. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-20Added WoW style item adding to chat window. Right click, then leftDavid Athay1-5/+5
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-1/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-15Integrated the ItemPopup class from Legends of Mazzeroth.Ira Rice1-1/+40
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-13Added WoW style item adding to chat window. Right Ctrl and Left click to put ↵David Athay1-3/+18
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-06Fixed font colors in inventory and shortcut windowBjørn Lindeijer1-0/+1
They were not explicitly set to black. Because the bitmap font used to be black, these bugs didn't show up earlier. With the introduction of true type fonts, the text can be any color anywhere.
2008-12-29Added support for True Type Fonts using GUIChan's inbuilt SDLTrueTypeIra Rice1-0/+1
class. NOTE: This commit adds a brand new dependency (SDL_TTF). Make sure to install it, regenerate your config files, reconfigure, and then install before attempting to compile. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-13Added ability to add equipment to the shurtcut barBjørn Lindeijer1-8/+4
Patch by Nikos, with some improvements. Conflicts: NEWS src/gui/itemcontainer.cpp src/itemshortcut.cpp (cherry picked from eAthena client, not functional here yet)
2008-12-07Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'Ira Rice1-18/+9
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-23/+59
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-4/+36
same ID whenever we lose the current one
2008-11-28Changed inventory container protocol to guarantee that we have no stale item ↵Fate1-20/+23
references lying around
2008-11-25Miscellaneous TMW change commits. Missed these changes before because of Ira Rice1-1/+1
a confusion on git.
2008-11-22Added ability to add equipment to the shurtcut barNikos Giagtzoglou1-17/+8
Patch by Nikos, with some improvements.
2008-11-18Pedantic fixes to the client, where I alphabetized all of the include Ira Rice1-3/+1
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-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-09-12Fixed /where, added /cast for heal and gather, some changes to inventory to ↵Lloyd Bryant1-6/+9
support storage
2008-07-18Import of client treeLloyd Bryant1-1/+1
2008-07-01Ported some GUI improvements from Legend of Mazeroth (GUI skinning via XML ↵Philipp Sehmisch1-4/+37
files, item descriptions on mouse-over, map names in minimap window, speech bubbles)
2008-06-12Merged revisions 3738 via svnmerge from Bjørn Lindeijer1-6/+5
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-17/+17
properly since upgrade to Guichan 0.8.0.
2008-04-27Fix buildup of whitespace by using correct gridHeight and adding just 4px ↵Dennis Friis1-2/+2
space to bottom.
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-28 22:16:49 +0000