summaryrefslogtreecommitdiff
path: root/src/beingmanager.cpp
AgeCommit message (Collapse)AuthorFilesLines
2009-03-27Fixed some positioning issuesBjørn Lindeijer1-4/+5
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-27Merge branch 'aethyra/master'Bjørn Lindeijer1-2/+1
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-25A host of code style fixesBjørn Lindeijer1-1/+1
Mostly putting & and * in the right place and making some getters const.
2009-03-25Merge branch 'eathena/master'Bjørn Lindeijer1-23/+31
Conflicts: A lot of files.
2009-03-23Move all TMWServ-specific code to net/tmwservJared Adams1-1/+1
Also fix several instances where the same net handler was being used for both servers, and a few other related oddities.
2009-03-22Fixed map name saving in the engine class. Somehow, the const getsIra Rice1-3/+3
overridden after map_path, so the saved map path needs to get saved before that. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-22Merged the tmwserv client with the eAthena clientBjørn Lindeijer1-6/+74
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-15Fix some mem leaksJared Adams1-0/+5
2009-03-10Fix some mem leaksJared Adams1-5/+0
2009-03-10Fix some mem leaksJared Adams1-0/+5
2009-03-10Fix some mem leaksJared Adams1-0/+5
2009-03-06Merge branch 'aethyra/master'Bjørn Lindeijer1-11/+4
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-11/+4
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-8/+8
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-8/+8
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-4/+4
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-26Forgot to extend the player or NPC specifying fields as well.Ira Rice1-1/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-26Extended job numbers based on what's actually used for Ragnarok'sIra Rice1-3/+3
server. TODO: Make this externally configurable, so that specific servers can specify what they use specific sprite IDs for, as well as specifying good defaults as well, in case that configuration file isn't found. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-25Fix NPC handling to not need a handle on the NPCIra Rice1-0/+10
Loosely based on TMW commit f04a8713ffc83db8b3dc4a472b28aad25a2b2bd1 Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-25Fix NPC handling to not need a handle on the NPCJared Adams1-10/+11
The Being ID is used instead, as that is all that was ever really needed.
2009-02-25Fix some problems with deleting NPCs earlyJared Adams1-1/+10
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-09Merged with Aethyra master as of 2009-01-27Bjørn Lindeijer1-7/+14
Conflicts: Almost everywhere.
2009-02-07Some more include cleanups.Ira Rice1-2/+0
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/+3
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-3/+7
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-9/+10
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-20Fix range for NPCs to not include the warp classJared Adams1-1/+1
2009-01-20Allow more monster typesJared Adams1-1/+1
2009-01-20Allow more NPCsJared Adams1-3/+3
2008-12-08Introduced another template to make deleting all values in a container easier.Bjørn Lindeijer1-3/+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-11-18Pedantic fixes to the client, where I alphabetized all of the include Ira Rice1-3/+0
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-10-31Merged revisions 4071,4093,4100,4363 via svnmerge from Bjørn Lindeijer1-0/+22
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0 ........ r4071 | the_enemy | 2008-04-11 16:12:30 +0200 (Fri, 11 Apr 2008) | 3 lines Players now need to click on the monster sprites rather than the tile. Players will now move to the target before attacking it. ........ r4093 | the_enemy | 2008-04-15 18:10:32 +0200 (Tue, 15 Apr 2008) | 1 line Fixed clicking near player. ........ r4100 | peaveydk | 2008-04-16 13:59:36 +0200 (Wed, 16 Apr 2008) | 1 line Cancel walking to a clicked monster if the target is lost while getting to it (killed or otherwise removed). ........ r4363 | crush_tmw | 2008-06-24 14:42:04 +0200 (Tue, 24 Jun 2008) | 1 line corrected date in changelog ........
2008-10-25attack range fixes, highlight monsters in range (by Chuck Miller)Roderic Morris1-25/+14
2008-10-24fixes for targetting (by Chuck Miller)Roderic Morris1-2/+4
2008-10-09Merged the movement branch into trunkBjørn Lindeijer1-6/+9
I consider this the only way forward. In my tests this code isn't actually doing worse than what was there before. Of course some cases are a bit broken, and I'm open to any kind of feedback so that we can fix those issues.
2008-09-25Merged the Tametomo branch into trunk.Ira Rice1-8/+9
2008-09-15Commented out getBeingByPixel because it really isn't used, nor is there Ira Rice1-2/+2
much sense to. Shouldn't make any visible changes to performance yet, but I trimmed it out for now anyways.
2008-09-04Introduced another template to make deleting all values in a container easier.Bjørn Lindeijer1-2/+1
Inspired by qDeleteAll() from Qt.
2008-07-18Import of client treeLloyd Bryant1-1/+1
2008-05-14Added ability to define friends, players you want to ignore or disregard andBjørn Lindeijer1-0/+15
configure whether trading is allowed. Based on new popup code, configuration improvements to store hierarchical data and a table model.
2008-04-22Fixed a bug, thanks GCC 4.3!Bjørn Lindeijer1-1/+1
2008-04-15Fixed clicking near player.David Athay1-0/+1
2008-04-11 Players now need toDavid Athay1-0/+21
click on the monster sprites rather than the tile. Players will now move to the target before attacking it.
2008-03-23Merged revisions 3823,3825-3826,3829,3831-3839,3841-3842 via svnmerge from Bjørn Lindeijer1-0/+27
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0 ........ r3823 | crush_tmw | 2007-12-28 19:36:58 +0100 (Fri, 28 Dec 2007) | 1 line Added the possibility to assign particle effects to monsters in the monster database. Added flame particle effect to fire goblin as a proof of concept. ........ r3826 | crush_tmw | 2007-12-30 01:02:14 +0100 (Sun, 30 Dec 2007) | 1 line Added a key for targeting the nearest player character based on patches by Trinexx. Some mapping fixes at snake dungeon map. ........ r3839 | the_enemy | 2008-01-13 17:28:50 +0100 (Sun, 13 Jan 2008) | 1 line Fixed non-default location music loading ........ r3842 | crush_tmw | 2008-01-14 11:48:13 +0100 (Mon, 14 Jan 2008) | 1 line ixed an error in Davids last commit (couldn't compile that way). ........
2007-12-30Added a key for targeting the nearest player character based on patches by ↵Philipp Sehmisch1-0/+27
Trinexx. Some mapping fixes at snake dungeon map.
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-10-30 17:56:48 +0000