summaryrefslogtreecommitdiff
path: root/src/inventory.h
AgeCommit message (Collapse)AuthorFilesLines
2009-04-11Remove more support #ifdefsJared Adams1-1/+1
2009-04-02Fixed number of trade window slotsBjørn Lindeijer1-8/+10
On eAthena you can only trade up to 10 items at a time. For now I don't care whether tmwserv would handle more, we'll unify that later. It's not so nice anyway to hardcode the number of rows and columns in my opinion.
2009-03-27Moved the inventory and storage offset handling into netcodeBjørn Lindeijer1-9/+4
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-25Merge branch 'eathena/master'Bjørn Lindeijer1-1/+14
Conflicts: A lot of files.
2009-03-23Merge branch 'aethyra/master'Bjørn Lindeijer1-1/+2
Conflicts: Many files.
2009-03-22Merged the tmwserv client with the eAthena clientBjørn Lindeijer1-9/+3
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-09Add an interface for eAthena's storage systemJared Adams1-1/+3
2009-03-08Add an interface for eAthena's storage systemJared Adams1-0/+1
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-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-0/+7
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-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-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-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-3/+7
support storage
2008-07-18Import of client treeLloyd Bryant1-1/+1
2008-06-12Merged revisions 3738 via svnmerge from Bjørn Lindeijer1-5/+18
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-12-21Fixed inventory size not matching the size assumed by eAthena and relatedBjørn Lindeijer1-1/+1
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-4/+4
on demand. Results in faster startup time and reduced memory usage.
2007-09-25Added some const qualifiers.Bjørn Lindeijer1-4/+4
2007-08-14mantis_id:129 - Inventory Window Slots Added.Joshua Langley1-1/+7
2007-07-31Removed legacy inventory code. Added display of equipment.Guillaume Melquiond1-2/+2
2007-01-04Merged 0.0 changes from revision 2898 to 2988 to trunk.Bjørn Lindeijer1-0/+7
2006-12-16Fixed connection dialog visibility and fixed issues with walking one tile tooBjørn Lindeijer1-0/+7
many and changing direction towards an obstacle.
2006-02-23A bunch of mostly cosmetic cleanups.Björn Steinbrink1-1/+1
2006-01-22Merged NETWORK branch (includes BEING_OVERHAUL).Björn Steinbrink1-15/+1
2005-10-09* Made Sprite into an interface implemented by both FloorItem and Being, whichBjørn Lindeijer1-2/+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-08-13Huge header cleanup to reduce dependencies and compile time.Björn Steinbrink1-19/+2
2005-08-01Added code to dynamically adjust the itemcontainer size.Björn Steinbrink1-0/+5
2005-07-18Created Inventory class. (Really) Small code simplifications and cleanups.Björn Steinbrink1-0/+114
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-08 16:49:08 +0000