summaryrefslogtreecommitdiff
path: root/src/inventory.cpp
AgeCommit message (Collapse)AuthorFilesLines
2009-03-27Moved the inventory and storage offset handling into netcodeBjørn Lindeijer1-9/+3
No need to complicate the item containers and inventory classes with a silly offset used by the eAthena server. Also fixed the logToStandardOut option by reading it from the config after the configuration has been initialized.
2009-03-25A host of code style fixesBjørn Lindeijer1-2/+2
Mostly putting & and * in the right place and making some getters const.
2009-03-25Merge branch 'eathena/master'Bjørn Lindeijer1-7/+9
Conflicts: A lot of files.
2009-03-23Merge branch 'aethyra/master'Bjørn Lindeijer1-5/+6
Conflicts: Many files.
2009-03-22Merged the tmwserv client with the eAthena clientBjørn Lindeijer1-6/+13
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-09Got rid of an ugly and unified interface breaking cancel button in favorIra Rice1-1/+1
of adding overridable close functionality to the Window class. Now, if you need a close button, but need to do something different, or in addition to the Window close functionality, you can override it and do that action. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-09Add an interface for eAthena's storage systemJared Adams1-5/+6
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-07Some more include cleanups.Ira Rice1-22/+20
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.
2008-12-07Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'Ira Rice1-1/+6
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-28Fixed potential segfault introduced while adding extra checks to inventoryFate1-1/+1
2008-11-28Changed inventory container protocol to guarantee that we have no stale item ↵Fate1-1/+1
references lying around
2008-11-25Miscellaneous TMW change commits. Missed these changes before because of Ira Rice1-3/+3
a confusion on git.
2008-11-22Inventory window now displays amount of slots usedNikos Giagtzoglou1-3/+8
Patch by Nikos, with some improvements by vargavind.
2008-11-18Pedantic fixes to the client, where I alphabetized all of the include Ira Rice1-4/+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-14/+15
support storage
2008-08-18Fixed bugs with new arrow typesLloyd Bryant1-8/+0
2008-07-18Import of client treeLloyd Bryant1-1/+1
2008-06-12Merged revisions 3738 via svnmerge from Bjørn Lindeijer1-28/+48
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-25Avoid stacking equipment other than arrows. Based on similar fix in ↵Dennis Friis1-1/+7
inventoryhandler.
2008-02-20Merged revisions 3790,3799,3801-3807,3809-3810,3812-3813,3815-3816,3818-3821 ↵Bjørn Lindeijer1-0/+6
via svnmerge from https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0 ........ r3790 | b_lindeijer | 2007-12-18 14:54:17 +0100 (Tue, 18 Dec 2007) | 3 lines Remember to delete the progressbar and label also when the game was not started. ........ r3801 | b_lindeijer | 2007-12-21 12:56:23 +0100 (Fri, 21 Dec 2007) | 2 lines Fixed shop list box not to scroll up when the selection is removed. ........ r3802 | b_lindeijer | 2007-12-21 13:37:17 +0100 (Fri, 21 Dec 2007) | 2 lines Added logging of error on PHYSFS_addToSearchPath. ........ r3803 | b_lindeijer | 2007-12-21 15:56:38 +0100 (Fri, 21 Dec 2007) | 3 lines Fixed inventory size not matching the size assumed by eAthena and related memory corruption and increased default chat log length. ........ r3804 | the_enemy | 2007-12-21 16:07:20 +0100 (Fri, 21 Dec 2007) | 1 line Attempted to fix client freeze when unable to connect to update host, and added exit dialog ........ r3805 | b_lindeijer | 2007-12-22 16:24:14 +0100 (Sat, 22 Dec 2007) | 2 lines Updated version to 0.0.24. Release data set to tomorrow, we'll see. ........ r3806 | b_lindeijer | 2007-12-22 21:42:35 +0100 (Sat, 22 Dec 2007) | 2 lines Make sure chat messages are also trimmed for the local player. ........ r3809 | crush_tmw | 2007-12-23 03:16:53 +0100 (Sun, 23 Dec 2007) | 1 line Particle images are now reference-counted properly. Avoided attempts to load "data/graphics/" when a monster or equipment piece has no sprite. Error placeholder is now used when attempting to load a sprite definition file that doesn't exist. ........ r3810 | b_lindeijer | 2007-12-24 02:20:42 +0100 (Mon, 24 Dec 2007) | 2 lines Updated release date. ........ r3812 | the_enemy | 2007-12-24 15:16:15 +0100 (Mon, 24 Dec 2007) | 1 line Minor update, fixed disconnection dialog ........ r3813 | b_lindeijer | 2007-12-24 15:45:34 +0100 (Mon, 24 Dec 2007) | 2 lines Fixed compile warning. ........ r3816 | b_lindeijer | 2007-12-25 13:31:21 +0100 (Tue, 25 Dec 2007) | 2 lines Fixed year. :) ........ r3818 | b_lindeijer | 2007-12-25 23:11:55 +0100 (Tue, 25 Dec 2007) | 2 lines Updated CMake file. ........ r3821 | b_lindeijer | 2007-12-26 19:06:15 +0100 (Wed, 26 Dec 2007) | 2 lines Fixed year in README too. ........
2007-12-21Fixed inventory size not matching the size assumed by eAthena and relatedBjørn Lindeijer1-0/+7
memory corruption and increased default chat log length.
2007-11-15Moved item icon from ItemInfo class to the Item class, so that it can be loadedBjørn Lindeijer1-21/+27
on demand. Results in faster startup time and reduced memory usage.
2007-09-25Added some const qualifiers.Bjørn Lindeijer1-4/+4
2007-09-20Merged a bunch of small changes from trunk to 0.0 and set svn:eol-style Bjørn Lindeijer1-1/+1
to native for some files that were still missing this property. This is a feeble attempt to reduce the amount of conflicts for future merges.
2007-08-14mantis_id:129 - Inventory Window Slots Added.Joshua Langley1-5/+9
2007-07-31Removed legacy inventory code. Added display of equipment.Guillaume Melquiond1-7/+4
2007-01-04Client-side hack for picking up items.Guillaume Melquiond1-1/+1
2006-03-08Made Inventory use STL algorithms and fixed getLastUsedSlot semantics.Björn Steinbrink1-22/+18
2006-02-23A bunch of mostly cosmetic cleanups.Björn Steinbrink1-20/+20
2006-01-22Merged NETWORK branch (includes BEING_OVERHAUL).Björn Steinbrink1-43/+1
2005-10-16Rename {read,write}{Byte,Short,Long} to {read,write}Int{8,16,32}.Björn Steinbrink1-11/+11
2005-10-06Transition to SDL integer types. Some int vs. long issues fixed. Return NULL ↵Björn Steinbrink1-0/+5
when requesting an invalid inventory item.
2005-09-19Got rid of writeSet() calls.Eugenio Favalli1-5/+0
2005-09-19Removed useless flush() calls.Eugenio Favalli1-4/+0
2005-09-17Completed transition to use MessageOut.Eugenio Favalli1-11/+18
2005-09-13Merged with SDL_NET_TEST branch.Björn Steinbrink1-19/+19
2005-08-13Huge header cleanup to reduce dependencies and compile time.Björn Steinbrink1-0/+21
2005-08-01Added code to dynamically adjust the itemcontainer size.Björn Steinbrink1-0/+13
2005-07-18Created Inventory class. (Really) Small code simplifications and cleanups.Björn Steinbrink1-0/+134