summaryrefslogtreecommitdiff
path: root/src/being.h
AgeCommit message (Collapse)AuthorFilesLines
2009-03-27Fixed some positioning issuesBjørn Lindeijer1-31/+16
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-27Fixed position of dots on minimapBjørn Lindeijer1-14/+5
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 include structure in resource/ directoryBjørn Lindeijer1-1/+1
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-26Remove redundancy, fix variable names and other code cleanupsBjørn Lindeijer1-5/+0
2009-03-25Merge branch 'eathena/master'Bjørn Lindeijer1-36/+40
Conflicts: A lot of files.
2009-03-23Merge branch 'aethyra/master'Bjørn Lindeijer1-4/+2
Conflicts: Many files.
2009-03-22Merged the tmwserv client with the eAthena clientBjørn Lindeijer1-13/+129
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-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-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-12Move emote sprite loading into EmoteDBJared Adams1-9/+1
2009-03-11Fix segfault when being count reaches 0 too oftenJared Adams1-1/+4
2009-03-11Remove some duplication in hair loading codeJared Adams1-2/+6
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-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-06Merge branch 'aethyra/master'Bjørn Lindeijer1-10/+10
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-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-03-06Got 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-15Merge commit 'aethyra/master'Bjørn Lindeijer1-0/+23
Conflicts: CMakeLists.txt configure.ac data/help/header.txt packaging/windows/setup.nsi po/POTFILES.in src/being.cpp src/being.h src/game.cpp src/gui/color.cpp src/gui/color.h src/gui/equipmentwindow.h src/gui/popupmenu.cpp src/gui/recorder.cpp src/gui/setup_colors.h src/gui/setup_keyboard.cpp src/gui/setup_keyboard.h src/gui/skill.cpp src/gui/speechbubble.cpp src/gui/speechbubble.h src/gui/table.cpp src/keyboardconfig.cpp src/keyboardconfig.h src/localplayer.cpp src/main.cpp src/main.h src/map.cpp src/resources/colordb.cpp src/resources/colordb.h src/resources/emotedb.cpp src/resources/emotedb.h src/text.cpp src/text.h src/tmw.rc src/winver.h
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-09Merged with Aethyra master as of 2009-02-09Bjørn Lindeijer1-19/+24
Conflicts: A lot of files...
2009-02-09Mostly whitespace fixesBjørn Lindeijer1-2/+3
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-09Merged with Aethyra master as of 2009-01-27Bjørn Lindeijer1-18/+71
Conflicts: Almost everywhere.
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-28Added channel highlighting upon activity. Added /kick command to get rid of ↵David Athay1-2/+2
users from a channel
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-25Removed the TMW branding from header guardsBjørn Lindeijer1-2/+2
2009-01-25Fixed offset of right-click hitboxes and made NPCs without sprites clickable.Philipp Sehmisch1-0/+4
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-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
2009-01-05Handling gender with an enum everywhere.Philipp Sehmisch1-4/+9
(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-22/+2
2008-12-17Code reformattingBjørn Lindeijer1-4/+5
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.
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-18 12:28:41 +0000