summaryrefslogtreecommitdiff
path: root/src/being.cpp
AgeCommit message (Collapse)AuthorFilesLines
2009-03-27Fixed selection shadow not to overlap the emoticonsBjørn Lindeijer1-2/+2
Also fixed positioning for emoticons above the player sprite. Mantis-issue: 675
2009-03-27Fixed some positioning issuesBjørn Lindeijer1-27/+32
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-43/+16
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-27Merge branch 'aethyra/master'Bjørn Lindeijer1-3/+2
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-26Fixed duplicate check for item namesBjørn Lindeijer1-1/+1
2009-03-25Merged relevent changes from TMW commitIra Rice1-20/+5
dfcc6397848d4597b386b688f689352de6c19ae2 Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-26Remove redundancy, fix variable names and other code cleanupsBjørn Lindeijer1-20/+4
2009-03-25Merge branch 'eathena/master'Bjørn Lindeijer1-135/+95
Conflicts: A lot of files.
2009-03-23Merge branch 'aethyra/master'Bjørn Lindeijer1-5/+6
Conflicts: Many files.
2009-03-22Merged the tmwserv client with the eAthena clientBjørn Lindeijer1-11/+304
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-25/+16
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-23/+14
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-12Made hair load again (commit e2d60401eaf55abe9e2251854f3174ffe0f4ad9eIra Rice1-2/+14
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-29/+1
2009-03-12Move emote sprite loading into EmoteDBJared Adams1-23/+2
2009-03-11Fix segfault when being count reaches 0 too oftenJared Adams1-29/+27
2009-03-11Remove some duplication in hair loading codeJared Adams1-52/+23
2009-03-11Fix segfault when being count reaches 0 too oftenJared Adams1-29/+27
2009-03-10Extended hit type handlingsniper1-31/+24
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-17/+37
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-41/+20
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-41/+20
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-1/+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-06Got rid of Sint{8,16,32} and Uint32 for being IDBjørn Lindeijer1-1/+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-02-26Merge branch 'aethyra/master'Bjørn Lindeijer1-5/+21
Conflicts: data/graphics/images/login_wallpaper.png src/being.cpp src/beingmanager.cpp src/engine.cpp src/game.cpp src/gui/buysell.cpp src/gui/buysell.h src/gui/gui.h src/gui/npc_text.cpp src/gui/npc_text.h src/gui/npcintegerdialog.cpp src/gui/npclistdialog.cpp src/gui/npclistdialog.h src/gui/npcstringdialog.cpp src/gui/sell.cpp src/gui/shop.cpp src/gui/table.cpp src/net/beinghandler.cpp src/net/npchandler.cpp src/net/playerhandler.cpp src/npc.cpp src/npc.h src/shopitem.cpp src/shopitem.h src/utils/stringutils.cpp src/utils/stringutils.h src/utils/trim.h
2009-02-20Removed the last of the image particle guichan fonts.Ira Rice1-9/+37
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-18Introduced a toLower method and grouped string utilsBjørn Lindeijer1-3/+2
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-2/+1
The string utility methods are now grouped together in the stringutils.h header. Also, a toLower method was added for convenience.
2009-02-17Fix segfault when canceling new character dialogJared Adams1-1/+1
2009-02-17Fix segfault when canceling new character dialogJared Adams1-1/+1
2009-02-17Merge branch 'aethyra/master'Bjørn Lindeijer1-0/+3
Conflicts: src/gui/npc_text.cpp src/gui/npc_text.h src/gui/npcintegerdialog.cpp src/gui/npclistdialog.cpp src/gui/npcstringdialog.cpp src/net/npchandler.cpp src/npc.cpp
2009-02-16Moved target unsetting on NPCs and monsters to the being class. This isIra Rice1-0/+4
done to ensure that the client doesn't crash if the target dies and is removed from the map (since target drawing is based off of the specific target reporting its x and y coordinates). Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-15Removed unnecessary parenthesis at constructorsBjørn Lindeijer1-3/+3
When not passing any parameters to constructors, there is no reason for using parenthesis.
2009-02-15Merge commit 'aethyra/master'Bjørn Lindeijer1-35/+42
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-11Adjusted a few files for release.Ira Rice1-1/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-11Restored particle effects on hits and critical hits.Philipp Sehmisch1-15/+2
2009-02-10Use string::empty() instead of comparing to ""Bjørn Lindeijer1-1/+1
2009-02-10Removed many pointless comparisons with NULLBjørn Lindeijer1-4/+4
Sometimes it's nice for clarity, but most of the time this is just clutter. C++ != Java. :)
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-10/+18
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-11Removed many pointless comparisons with NULLBjørn Lindeijer1-4/+4
Sometimes it's nice for clarity, but most of the time this is just clutter. C++ != Java. :)
2009-02-10Use string::empty() instead of comparing to ""Bjørn Lindeijer1-4/+4
2009-02-10Simplified target drawing so that it actually uses the SimpleAnimationIra Rice1-34/+28
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-10Changed spelling from colour to color.Philipp Sehmisch1-3/+3
2009-02-09Mostly whitespace fixesBjørn Lindeijer1-14/+14
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-16/+17
Conflicts: A lot of files...
2009-02-09Mostly whitespace fixesBjørn Lindeijer1-15/+15
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-57/+192
Conflicts: Almost everywhere.
2009-02-08Mostly fixed a few field values to behave better in Windows, as well asIra Rice1-2/+2
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-0/+6
Signed-off-by: Ira Rice <irarice@gmail.com>
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-08-01 22:13:22 +0000