summaryrefslogtreecommitdiff
path: root/src/being.cpp
AgeCommit message (Collapse)AuthorFilesLines
2009-01-15Added emote database, which is loosely based off of the NPC database.Ira Rice1-9/+17
Also changed all emotes to be animated sprites now, and to load from emotes.xml. This gives us a bit more flexibility to not only add more emotes in the future, but allowing them to be animated as well. NOTE: This commit, unlike the previous emote commits, breaks emotes if you don't have the xml file. This will be available on Aethyra soon, but is not rolled into an update at the moment. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-15Style cleanups throughout most of the code. Splitting function type fromIra Rice1-3/+0
the function names should no longer be around. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-10Changed a few emote variable names to be more sensible, as well asIra Rice1-2/+3
removing emotions.png from the client data files (should have never been there to begin with, IMO). TODO: Simplify the emote code so that there is a lot less redundant code, as well as make filling out the possible emotes more flexible. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-09Added the ability to see your own name in game.Ira Rice1-0/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-05Renamed PATH_NODE to Position as on mainlineBjørn Lindeijer1-8/+8
2009-01-05Handling gender with an enum everywhere.Philipp Sehmisch1-2/+2
(cherry picked from mainline commit d3adc61aa4b4924f82d8cbc23bea26da7257da97) Conflicts: src/net/beinghandler.cpp src/net/charserverhandler.cpp src/player.cpp src/player.h
2009-01-05Handling gender with an enum everywhere.Philipp Sehmisch1-3/+4
(cherry picked from mainline commit d3adc61aa4b4924f82d8cbc23bea26da7257da97) Conflicts: src/net/beinghandler.cpp src/net/charserverhandler.cpp src/player.cpp src/player.h
2009-01-05Renamed PATH_NODE to Position as on mainlineBjørn Lindeijer1-8/+8
2008-12-26Fixed a potential leak in setup, changed the default border color toIra Rice1-4/+0
white for wallpapers (matches our wallpapers better), and fixed the effect manager. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-17Code reformattingBjørn Lindeijer1-0/+1
Mainly making sure 'const std::string &' is used everywhere instead of 'std::string const &'. The former has always been the preferred order in this project.
2008-12-14Code reformattingBjørn Lindeijer1-0/+1
I wish I had never fallen for this weird style, and I hope removing it will prevent others from introducing new code like this. :-) (cherry picked from eAthena branch, commit 68760426532b9ca4c6939d7a7b8faa1586ee82e0) Conflicts: src/being.cpp src/being.h src/gui/tabbedcontainer.cpp src/particle.cpp src/particle.h
2008-12-14Fixed follow-parent of nested and being-following particle emittersPhilipp Sehmisch1-2/+4
2008-12-14Fixed follow-parent of nested and being-following particle emittersPhilipp Sehmisch1-2/+2
2008-12-13Code style reformattingBjørn Lindeijer1-32/+17
Got rid of "void" in functions that take no arguments and removed the newline after the return type of a method in many places.
2008-12-13Added support for being effects through the eAthena levelup message, and checkBjørn Lindeijer1-1/+102
whether the being exists before referencing it. Re-enabled proper MP bar display. Improved handling of a warp to the same map. (patch by Fate) (cherry picked from eAthena client, the part about the levelup message doesn't apply, and we now seem to have a second "effect manager"...) Conflicts: ChangeLog src/being.cpp src/being.h src/engine.cpp src/engine.h src/gui/ministatus.cpp src/net/beinghandler.cpp src/net/playerhandler.cpp src/net/protocol.h
2008-12-13* Use hair.xml to determine hair colours (#514)Fate1-2/+92
* Auto-detect number of hair styles available (#514) Conflicts: ChangeLog src/being.cpp src/being.h src/gui/char_select.cpp (cherry picked from eAthena client)
2008-12-13Moved gender and hair style back to BeingBjørn Lindeijer1-0/+9
These properties should also apply to NPCs and possibly even monsters in the future.
2008-12-09Only play status effect sound effects for localplayerFate1-2/+0
2008-12-09Defer re-adding of particles to next call to Being::logic() to avoid crashFate1-1/+15
2008-12-09Status particle effects: when looking up block IDs (effect IDs for otherFate1-6/+6
players), make sure to initialise if needed Status particle effects: properly delete particles after effect has worn off
2008-12-08Mostly code reformattingBjørn Lindeijer1-2/+3
2008-12-08Code reformattingBjørn Lindeijer1-38/+20
I wish I had never fallen for this weird style, and I hope removing it will prevent others from introducing new code like this. :-)
2008-12-08Introduced another template to make deleting all values in a container easier.Bjørn Lindeijer1-2/+1
Inspired by qDeleteAll() from Qt. Conflicts: ChangeLog src/beingmanager.cpp src/channelmanager.cpp src/gui/skill.cpp src/map.cpp src/resources/monsterinfo.cpp (cherry picked from mainline)
2008-12-07Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'Ira Rice1-33/+13
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-12-07Added client-side status change handlers (text, icon, particle effect, audio).Fate1-0/+63
2008-12-06Added particle containers and refactored beings to use them (to clean up ↵Fate1-29/+5
responsibilities a little)
2008-12-03Add an effects manager (patch by Kage Jittai)Ira Rice1-90/+0
NOTE: This patch demonstrates the need to fix pixel coordinates in the eAthena client. Bjorn did the movement patch in the TMWClient, however, I still haven't got that fully working with the merges. It's likely that a clone will be developed to tackle this problem. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-11-18Pedantic fixes to the client, where I alphabetized all of the include Ira Rice1-6/+3
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-11-11Fixed a text glitch reported by Jarvellis.Ira Rice1-1/+1
2008-11-02This correctly fixes the attack problem. Apparently, I didn't realize a bit ↵Ira Rice1-0/+4
ago that the item type was being used to determine which attack animation to use, since a comment lied about it not being used.
2008-11-02Fixed a hair color problem that Soft reported that I apparently broke when I ↵Ira Rice1-1/+1
de-hardcoded the hair colors.
2008-11-02Fixed weapon attacks, which apparently has been broken since the mapping ↵Ira Rice1-3/+0
code was imported, due to me changing the actions to enumerations.
2008-11-01* Use hair.xml to determine hair colours (#514)Fate1-4/+91
* Auto-detect number of hair styles available (#514)
2008-11-01Merged revisions 4300-4301 via svnmerge from Bjørn Lindeijer1-2/+2
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0 ........ r4300 | the_enemy | 2008-05-27 17:53:21 +0200 (Tue, 27 May 2008) | 1 line Changed location of tmw directory on OSX ........ r4301 | peaveydk | 2008-05-28 18:06:48 +0200 (Wed, 28 May 2008) | 1 line Change order of direction to up/down/right/left in Being::getSpriteDirection to fix inconsistancy of facing direction when walking diagonally. ........
2008-10-31Added a text patch done on TMW to increase the number of characters Ira Rice1-2/+2
supported (done by vargavind), as well as changing the effect used for critical updates (change of opinion on what looks better).
2008-10-31Added critical notifications to the client. While I had originally Ira Rice1-4/+20
planned to do this (I still did it my way), TMW beat me to implementing, so I'll credit them with their commit reminding me to do it. This is not done the exact same way, as I prefer to see an actual "crit!" show above the being, instead of an ambiguous particle.
2008-10-30Minor fixes to movement and hit effects. Patch by Kage_Jittai.Dennis Friis1-5/+4
2008-10-27Removed an unnecessary check.Ira Rice1-3/+0
2008-10-27De-hardcoded the number of hair styles.Ira Rice1-1/+14
2008-10-27Revised code so that dead sprites are de-targeted.Ira Rice1-0/+1
2008-10-27Merged the Tametomo branch back into trunk. Targeting has been removed Ira Rice1-2/+2
from the viewport, and is now located on the beings themselves. Eventually, this will be changed further so that the targets draw below the being, instead of maintaining the same logic, but baby steps first.
2008-10-23Removed a few compiler warnings.Ira Rice1-3/+3
2008-10-19Fixed a small error that I didn't notice before with de-hardcoding the Ira Rice1-3/+0
colors. Thanks goes to paks for noticing this.
2008-10-16Fixed a width that I accidently messed up earlier, as well as made text Ira Rice1-10/+20
and speech bubble transitions smoother.
2008-10-15Added patch so that players can turn on or off speech bubbles.Ira Rice1-1/+25
2008-10-15De-hardcoded colors in trunk. Now, all colors are loaded from Ira Rice1-1/+1
colors.xml.
2008-10-14Early addition of a particle effect disabling option. Would like to Ira Rice1-13/+18
change this in the future to update instantaneously.
2008-10-10Did a little bit of code cleanup (mostly from TMW changes) as well as Ira Rice1-1/+1
properly implemented line wrapping. Now, there are no more visual artifacts for speech boxes, and it always chooses the most optimal box size (which required that npc_text use it also. Do any other gui classes use the textbox class?).