summaryrefslogtreecommitdiff
path: root/src/being.h
AgeCommit message (Collapse)AuthorFilesLines
2009-03-12Make use of the new available colorsMajin Sniper1-1/+1
This patch lets all being derivatives use the palette to set their name's colors. Text Particle Effects all respect the new settings. Some widgets were updated to use the colors.
2009-03-12Removed some unneeded stub code.Ira Rice1-22/+3
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-12Made hair load again (commit e2d60401eaf55abe9e2251854f3174ffe0f4ad9eIra Rice1-2/+2
from TMW broke this, as it deleted the Being::load() method, which also loaded the hair styles). Also removed some unused variables in the being class. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-12Move emote sprite loading into EmoteDBJared Adams1-10/+0
2009-03-11Fix segfault when being count reaches 0 too oftenJared Adams1-1/+4
2009-03-10Extended hit type handlingsniper1-10/+17
The client can now differentiate between the following hit types: - hit (normal) - critical (full attack) - multi (more than one hit at once, currently not used) - reflect (reflected damage, currently not used) - flee (dodging criticals) The Being's showCrit method is now merged into takeDamage. Being's takeDamage and handleAttack now both get the opponent, the amount of damage and the attack type as parameter.
2009-03-05Made some optimizations based on some profiling done by Octalot, as wellIra Rice1-9/+9
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-6/+6
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-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-10Added two more options for displaying speech overhead (don't show it atIra Rice1-0/+9
all and show speech bubbles without names). Since a checkbox won't work any more for all of these modes, it's now a slider. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-10Simplified target drawing so that it actually uses the SimpleAnimationIra Rice1-4/+14
that it creates when initializing the target cursors in the first place. This behavior was carried over in the first place from the Viewport class. Also moved target drawing responsibility from the map to the being being targeted in the first place. This allows for assuring that targets are always drawn below the sprite being targeted (which the previous solution was designed to do, but didn't do correctly). Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-09Mostly whitespace fixesBjørn Lindeijer1-1/+1
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-08Mostly fixed a few field values to behave better in Windows, as well asIra Rice1-2/+5
removed the need for sending graphics to the setSpeech function (since it isn't needed) and started actually using the time variable which it's passed (could be set to show the speech longer if the dialog is longer, for example). Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-07Some more include cleanups.Ira Rice1-13/+19
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Moved mEquipment to the LocalPlayer class, since it's the only placeIra Rice1-3/+0
that uses it anyways. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Created a new equipment screen, which is loosely related to theIra Rice1-0/+3
equipment screen on TMW's mainline client. Also fixed up the player box so that it can be used in game as well, which could potentially be useful in the future for making future equipment dialog changes. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Bit of code cleanup for the last commit (moved default width and heightIra Rice1-3/+0
out of being.h, so that they aren't included in any classes that don't need them and cut the number of divisions in half in the being manager) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Fixed offset of right-click hitboxes and made NPCs without spritesIra Rice1-0/+3
clickable. Also set a minimum clickable area so that small mobs like maggots aren't too difficult to click. Been wanting this patched for a while, but didn't know where to look until Crush's patch for mainline click zones on TMW. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-25Removed the TMW branding from header guardsBjørn Lindeijer1-2/+2
2009-01-24Tweaks to the speech bubbles so that being status (GM, mob, npc,Ira Rice1-0/+2
regular player) is displayed in the speech bubbles now. No need to view your own name to be able to see whether you're showing as a GM now. 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.
2009-01-16Made emotes load in only one location, as well as fixing the code on theIra Rice1-0/+2
being so that the last emote draws (which got broken). Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-15Added emote database, which is loosely based off of the NPC database.Ira Rice1-2/+2
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-05Renamed PATH_NODE to Position as on mainlineBjørn Lindeijer1-18/+1
2009-01-05Handling gender with an enum everywhere.Philipp Sehmisch1-3/+9
(cherry picked from mainline commit d3adc61aa4b4924f82d8cbc23bea26da7257da97) Conflicts: src/net/beinghandler.cpp src/net/charserverhandler.cpp src/player.cpp src/player.h
2008-12-08Code reformattingBjørn Lindeijer1-0/+6
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-07Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'Ira Rice1-1/+16
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-06Defrobnicated ParticleContainer inheritance hierarchyFate1-2/+2
2008-12-06Added particle containers and refactored beings to use them (to clean up ↵Fate1-2/+10
responsibilities a little)
2008-12-03Add an effects manager (patch by Kage Jittai)Ira Rice1-9/+1
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-3/+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-01* Use hair.xml to determine hair colours (#514)Fate1-3/+7
* Auto-detect number of hair styles available (#514)
2008-10-31Added critical notifications to the client. While I had originally Ira Rice1-0/+5
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-27De-hardcoded the number of hair styles.Ira Rice1-2/+7
2008-10-27Made targets draw on the fringe layer, as well as added t for talking to Ira Rice1-1/+0
an NPC, n for targeting an NPC, and changed basic targeting code so that it'll time out after being on a target for longer than a minute.
2008-10-27Merged the Tametomo branch back into trunk. Targeting has been removed Ira Rice1-4/+6
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-15Added patch so that players can turn on or off speech bubbles.Ira Rice1-0/+2
2008-10-15De-hardcoded colors in trunk. Now, all colors are loaded from Ira Rice1-4/+4
colors.xml.
2008-10-14Early addition of a particle effect disabling option. Would like to Ira Rice1-0/+3
change this in the future to update instantaneously.
2008-09-25Fixed a bug that prevents compilation in some compilers.Ira Rice1-0/+1
2008-09-25Merged the Tametomo branch into trunk.Ira Rice1-60/+65
2008-09-07Added 2 new hair styles in game.Ira Rice1-1/+1
2008-09-07Added 6 colors for each of the hair styles. Since 10 is an odd number Ira Rice1-1/+1
for the number of colors for a packet, I added 6 more fun colors. I'd add in two more hair styles as well, but since I don't know if it's safe, I'm going to play it safe for now and not include them.
2008-08-28Accepted Patch by Scraggy that moves text in such a way that no text overlapsBjørn Lindeijer1-15/+13
2008-08-28Added support for being effects through the eAthena levelup message, and checkBjørn Lindeijer1-0/+20
whether the being exists before referencing it. Re-enabled proper MP bar display. Improved handling of a warp to the same map.
2008-08-28Applied patch put together by Jaxad0127 with changes from the Aethyra project.Bjørn Lindeijer1-0/+4
Improves compatibility with the newer version of eAthena and works around an initialization bug.
2008-08-13Added support for different colored fonts for different being typesLloyd Bryant1-0/+4
2008-07-23Added viewable cape/misc1/misc2, Chat button in GUILloyd Bryant1-0/+3
2008-07-18Added support for animated shoe and glove spritesLloyd Bryant1-0/+1
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-01-19 14:09:20 +0000