summaryrefslogtreecommitdiff
path: root/src/gui
AgeCommit message (Collapse)AuthorFilesLines
2009-03-27Moved the inventory and storage offset handling into netcodeBjørn Lindeijer2-11/+8
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-27Clean up some ifdefs and start cleanup of partiesJared Adams1-1/+0
2009-03-27Clean up of most of the Network pointersBjørn Lindeijer22-168/+15
Now that messages can be sent without requiring a pointer to the Network instance, a lot of cleanup was possible.
2009-03-27Made eAthena's Network class statically accessibleBjørn Lindeijer13-50/+24
Now the instance doesn't need to be passed into the MessageOut class anymore. Expect a lot of cleanup in the next commit.
2009-03-27Removed unnecessary parenthesis on constructorsBjørn Lindeijer11-19/+19
2009-03-27Clean up chat and chat tabs some moreJared Adams13-150/+114
2009-03-27Fixed selection shadow not to overlap the emoticonsBjørn Lindeijer1-23/+24
Also fixed positioning for emoticons above the player sprite. Mantis-issue: 675
2009-03-27Fixed inventory window. Not resizable though.Bjørn Lindeijer11-139/+108
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-27Gray out the magic bar when magic can't be usedBjørn Lindeijer1-0/+4
Restored code that probably got lost in a merge somewhere. Mantis-issue: 663
2009-03-27Fixed some positioning issuesBjørn Lindeijer1-1/+1
Started with not being able to click NPCs properly, and I ended up correcting the draw positions of overhead text, targets and sprite ordering. It's now a bit more straight-forward. The position of a being is simply in the middle of the sprite at the bottom. When drawing the sprite, an offset remains because all the sprites are compensating for getting drawn half a tile to the left and one tile up.
2009-03-27Removed the unused "logged" button statusBjørn Lindeijer2-12/+3
Seems to be remnant from before we had a proper tabbed area.
2009-03-27Removed all the static initializations of mAlphaBjørn Lindeijer16-16/+16
They happened before the configuration was initialized, so that didn't make any sense. It never showed up as a problem since the value is constantly set in the draw methods anyway.
2009-03-27Simplified and fixed initialization of login dataBjørn Lindeijer1-1/+2
Command line parameters were being overridden by old configuration settings.
2009-03-27Add some const to the chat tabsJared Adams6-8/+8
2009-03-27Fixed position of dots on minimapBjørn Lindeijer1-6/+1
Also made mPx and mPy private and synchronize with mPos on setPosition(). The side effects of setting destination and clearing the path have been removed from setPosition(). Only the tmwserv PlayerHandler seemed to rely on that feature. Mantis-issue: 672
2009-03-27Fixed copyright notices of skin.{h,cpp} filesBjørn Lindeijer2-17/+23
Also some code prettyfication.
2009-03-27Add a close command to WhisperTabJared Adams6-2/+30
2009-03-27Fix some problems with NPC dialogsJared Adams3-16/+0
NPCListDialog couldn't be opened because of infinite recursion, and it and NPCTextDialog both had resize bugs.
2009-03-27Merge branch 'aethyra/master'Bjørn Lindeijer20-318/+303
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-27Fixed some compiler warningsBjørn Lindeijer4-33/+32
Fixed a faulty == statement that should have been an assignment and a mismatched 'else' block.
2009-03-27Moved choosing of random death message to a functionBjørn Lindeijer1-1/+2
Also dynamically calculated the size of the array, so that you don't have to count the messages manually. :P
2009-03-27Changed the includes for the net/tmwserv/ directoryBjørn Lindeijer1-0/+2
2009-03-27Include statement cleanup for net/ea/ directory.Bjørn Lindeijer6-28/+26
2009-03-26Major clean up of ChatTab handlingJared Adams11-118/+69
ChatTabs now manage their own adding/removal from the chat window, which lost most of it's chat related messages. Whisper handling is stil done by the ChatWindow, but it no longer manages any other tabs. ChannelTab handling is now the sole responsability of the Channels they are attached to. The general tab is handled by Game.
2009-03-26Add WhisperTabsJared Adams5-1/+176
2009-03-26Removed setting and getting parent windows for popup classes, as thisIra Rice2-11/+1
wasn't really useful or used at all. Also removed some unneeded includes in the popup class. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-26Removed getting and setting a parent window from the popup class, sinceIra Rice3-18/+3
this currently does not provide any useful functionality to popups, as well as doing anything for that matter. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-26Fixed popup comment. This got chopped off some time when it was firstIra Rice1-2/+6
created. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-26Some code style commits influenced by TMW commitIra Rice1-12/+5
1715d0afe44a282a356ca88e47c92ec556f094dd Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-27Fixed name of "UpdateSliders" and reduced redundant docsBjørn Lindeijer6-59/+25
2009-03-27Fixed include structure in resource/ directoryBjørn Lindeijer8-102/+105
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-26Compile warning fixesBjørn Lindeijer6-37/+33
Mostly unsigned/signed mismatches and an unused variable.
2009-03-26Fix the ColorTypes MacroMajin Sniper2-8/+10
2009-03-27Compile warning fixesBjørn Lindeijer5-24/+20
Mostly unsigned/signed mismatches and an unused variable.
2009-03-27Fix the ColorTypes MacroMajin Sniper2-8/+10
2009-03-26Some code cleanups (mostly reducing how many calculations need to beIra Rice12-123/+81
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-26Add ChannelTab for chat channelsJared Adams6-26/+164
This fixes TMWServ compilation form the previous commit.
2009-03-26Move ChatWindow over to ChatTabsJared Adams5-415/+514
TMWServ compilation is likely not functional after this, I didn't check. THe next commit will address that.
2009-03-26First batch of include cleanupBjørn Lindeijer13-61/+64
Since the relative includes are getting ugly and somewhat inconvenient, we'll switch to includes relative to the project root. We've done this for a while already with tmwserv. Another rule which we've always had but was never written down, is that each source file first includes its own header. This is common practice and ensures each header compiles without needing other stuff to be included first. Somebody using Code::Blocks might want to fix the project file by adding the 'src' directory to the list of include paths.
2009-03-25Make sure the correct color for the pulse gradient shows up on theIra Rice1-0/+1
slider as well, rather than just in the preview, on startup. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-25Merged relevent changes from TMW commitIra Rice4-26/+24
dfcc6397848d4597b386b688f689352de6c19ae2 Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-26Fixes to file headers and header guardsBjørn Lindeijer33-170/+168
Mostly removal of branding for tmwserv related files, as was done for the eAthena client before.
2009-03-26Remove redundancy, fix variable names and other code cleanupsBjørn Lindeijer13-126/+114
2009-03-25Don't crash cause of deleting a model twiceBjørn Lindeijer1-3/+0
This reverts commit c2e4a7a70971355f1446bb01053af8a1da8c98e1.
2009-03-25A host of code style fixesBjørn Lindeijer33-79/+84
Mostly putting & and * in the right place and making some getters const.
2009-03-25Fixed some headers of recently added filesBjørn Lindeijer4-14/+10
2009-03-25Don't crash cause of deleting a model twiceBjørn Lindeijer1-3/+0
This reverts commit c2e4a7a70971355f1446bb01053af8a1da8c98e1.
2009-03-25Merge branch 'eathena/master'Bjørn Lindeijer121-1675/+4522
Conflicts: A lot of files.
2009-03-25Fixed a static leak in skin loading.Ira Rice1-0/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-25Relaxed collision and fringe naming slightly so that they just need toIra Rice1-1/+1
start with collision or fringe, instead of being required to be the same case throughout the beginning of the layer name. Also made a default name for popup menus so that their skins can also be changed by users. Signed-off-by: Ira Rice <irarice@gmail.com>