summaryrefslogtreecommitdiff
path: root/src/being.cpp
AgeCommit message (Collapse)AuthorFilesLines
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-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-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>
2009-02-04Moved mEquipment to the LocalPlayer class, since it's the only placeIra Rice1-2/+0
that uses it anyways. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-29Make sure that strings aren't chopped off when a | isn't found.Ira Rice1-1/+3
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-29If an item link isn't found, don't treat it as a link.Ira Rice1-1/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-28Removed manual trimmings in exchange for using trim.h instead.Ira Rice1-9/+3
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Bit of code cleanup for the last commit (moved default width and heightIra Rice1-6/+9
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-4/+10
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-25Fixed offset of right-click hitboxes and made NPCs without sprites clickable.Philipp Sehmisch1-2/+2
2009-01-24Tweaks to the speech bubbles so that being status (GM, mob, npc,Ira Rice1-2/+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-24Updated DejaVuSans ttf file, as well as adding the bolded version, whichIra Rice1-3/+4
is used in a few spots. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-24Use standard GUI font also for speech and namesBjørn Lindeijer1-2/+1
The speech bitmap font can't handle unicode, so it has now been replaced by the standard GUI font, drawn with a shadow for chat and with a full outline for names.
2009-01-24Use standard GUI font also for speech and namesBjørn Lindeijer1-1/+1
The speech bitmap font can't handle unicode, so it has now been replaced by the standard GUI font, drawn with a shadow for chat and with a full outline for names.
2009-01-24Added speech bubble background by QOALBjørn Lindeijer1-1/+1
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-21Fixed multiple embeddings of square brackets so that it doesn't crashIra Rice1-0/+7
the client. This commit makes it so that all brackets except for the innermost brackets are ignored. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-20Added the ability to parse multiple item links, as well as removingIra Rice1-3/+6
extra spaces before or after the [] tags. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-20Repaired text messages. While trimming out the link code is still a goodIra Rice1-10/+7
idea for the speech, I accidently trimmed it down to just the item name before. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-20Trim displayed speech to not show links.Ira Rice1-1/+33
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-16Made emotes load in only one location, as well as fixing the code on theIra Rice1-7/+4
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-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
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-26 23:10:46 +0000