summaryrefslogtreecommitdiff
path: root/src/gui/inventorywindow.cpp
AgeCommit message (Collapse)AuthorFilesLines
2009-04-10Some cleanup of the equipment window codeBjørn Lindeijer1-1/+0
Also removed some unnecessary delete statements, since the Popup class already deletes its children and the ScrollArea already deletes its content.
2009-04-07Moved basic widgets into the gui/widgets directoryBjørn Lindeijer1-4/+4
In an attempt to make the GUI code a little more structured, basic widgets are now put in gui/widgets. Many includes were also cleaned up.
2009-04-01Make eAthena's inventory handlerJared Adams1-8/+2
Also cleanup some related #ifdefs in LocalPlayer.
2009-03-28Make the full inventory accessible againBjørn Lindeijer1-5/+4
Was broken due to tmwserv having only 50 as opposed to 100 places in the inventory at the moment.
2009-03-27Fixed inventory window. Not resizable though.Bjørn Lindeijer1-41/+34
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-27Merge branch 'aethyra/master'Bjørn Lindeijer1-10/+8
Conflicts: src/beingmanager.cpp src/gui/confirm_dialog.cpp src/gui/inventorywindow.cpp src/gui/inventorywindow.h src/gui/label.cpp src/gui/label.h src/gui/popup.cpp src/gui/popup.h src/gui/scrollarea.cpp src/gui/skin.cpp src/gui/skin.h src/gui/speechbubble.cpp src/gui/window.cpp src/gui/window.h src/localplayer.h src/main.cpp src/net/ea/playerhandler.cpp src/resources/ambientoverlay.h src/resources/dye.cpp src/resources/imagewriter.cpp src/resources/itemdb.cpp src/shopitem.cpp
2009-03-26Some code cleanups (mostly reducing how many calculations need to beIra Rice1-10/+2
done in certain statements, rearranging arguements to make them look cleaner, or overall making the code slightly more flexible) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-25Merged relevent changes from TMW commitIra Rice1-21/+19
dfcc6397848d4597b386b688f689352de6c19ae2 Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-26Remove redundancy, fix variable names and other code cleanupsBjørn Lindeijer1-15/+9
2009-03-25Merge branch 'eathena/master'Bjørn Lindeijer1-6/+7
Conflicts: A lot of files.
2009-03-23Merge branch 'aethyra/master'Bjørn Lindeijer1-5/+4
Conflicts: Many files.
2009-03-22Merged the tmwserv client with the eAthena clientBjørn Lindeijer1-28/+113
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-19Reformatted the item amount window and the buy/sell windows so thatIra Rice1-1/+1
their guis are similarly laid out. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-14Made a label class derived from the guichan label class which utilizesIra Rice1-4/+3
the palette colors. While technically, this can be accomplished through other means, it's rather clumsy overall, and is prone to introducing in programmer errors. This commit finally catches every case where text is used, and applies the text color from the color dialog to each of them appropriately. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-10Extended window layout to take relative positions, as well as offsets toIra Rice1-2/+1
that position. This makes it so that when resolutions are changed, the default locations stay relative to the window's position, and not the 800x600 screen resolution. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-10Don't center the NPC interraction dialogsJared Adams1-1/+0
Use the last location the user gave instead. Also, do the same for the inventory dialog.
2009-03-06Merge branch 'aethyra/master'Bjørn Lindeijer1-0/+3
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-0/+3
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-03-05Got rid of Sint{8,16,32} and Uint32 for being IDBjørn Lindeijer1-0/+1
Using unsigned rarely makes sense, especially when the server doesn't use it either. Other uses of unsigned should be reviewed. In all other cases, int is the fastest integer type on any architecture. Using 8 or 16 bits can basically only be a memory optimization.
2009-03-06Microoptimization in compile speedBjørn Lindeijer1-0/+1
No need to include localplayer.h from inventorywindow.h
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-15Merge branch 'aethyra/master'Bjørn Lindeijer1-7/+0
2009-02-15Don't make window name translatableBjørn Lindeijer1-1/+1
The window name is used in the configuration file, in contrast to the window title.
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-7/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-15Add configurable units systemJared Adams1-8/+10
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-09Fixed width of the weight label, as noticed by Grimmjow.Ira Rice1-4/+4
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-09Mostly whitespace fixesBjørn Lindeijer1-3/+3
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-09Mostly whitespace and formatting changesBjørn Lindeijer1-2/+1
(merged from eAthena client)
2009-02-07Some more include cleanups.Ira Rice1-1/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04A few more pointers which weren't getting deleted.Ira Rice1-0/+12
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-30Moved weight and slots back to the top of the inventory window.Ira Rice1-6/+6
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Fixed a few default window sizes so that they look better for first timeIra Rice1-1/+1
client loaders. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Cleaned up inventory includes, as well as adding right click popup menusIra Rice1-0/+1
to the item shortcut container. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Modified the inventory window so that weight and slots used are shown asIra Rice1-20/+35
progress bars. Suggestion made by Forge. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-25Fixed use button so that it starts out at the maximum width it willIra Rice1-1/+11
need. TODO: Modify layout rendering to be able to detect resizes. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-25Repaired item weight and slot reporting.Ira Rice1-13/+14
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-25Modified the inventory window to be more TMW translation friendly.Ira Rice1-10/+15
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-25Removed the TMW branding from header guardsBjørn Lindeijer1-1/+1
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-20Reflowed inventory window to use layout code, as well as fixed the npcIra Rice1-59/+34
list dialog to be more consistant with other windows. Also revised the skill window to default to being only as big as the number of skills listed. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-20Added WoW style item adding to chat window. Right click, then leftDavid Athay1-3/+3
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-16Trimmed out some now unneeded fields in the inventory window.Ira Rice1-57/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
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-15A little bit of code cleanup/simplification.Ira Rice1-1/+0
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/+1
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-1/+4
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.
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-02-26 13:24:10 +0000