summaryrefslogtreecommitdiff
path: root/src/localplayer.cpp
AgeCommit message (Collapse)AuthorFilesLines
2009-03-27Fixed include structure in resource/ directoryBjørn Lindeijer1-0/+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-6/+3
2009-03-25Merge branch 'eathena/master'Bjørn Lindeijer1-32/+90
Conflicts: A lot of files.
2009-03-23Merge branch 'aethyra/master'Bjørn Lindeijer1-2/+2
Conflicts: Many files.
2009-03-23Move all TMWServ-specific code to net/tmwservJared Adams1-3/+3
Also fix several instances where the same net handler was being used for both servers, and a few other related oddities.
2009-03-22Merged the tmwserv client with the eAthena clientBjørn Lindeijer1-23/+508
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-9/+10
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-9/+10
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-09Add an interface for eAthena's storage systemJared Adams1-2/+9
2009-03-08Add an interface for eAthena's storage systemJared Adams1-0/+7
2009-03-08Fix some NPC-related bugsJared Adams1-15/+25
NPCs are always in range, so show it. Also, don't attack NPCs (causes an infinite talk loop with most).
2009-03-06Merge branch 'aethyra/master'Bjørn Lindeijer1-1/+25
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-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-03-02Cut down on constant streaming of attacks. Attacks from players now onlyIra Rice1-1/+1
occur on each swing action. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-02Added particle attacks back on to the players. However, instead of beingIra Rice1-1/+25
constant, particle attacks are now weapon specific, so that different weapons can have different attacks. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-28Allow sending attack packets when not in rangeJared Adams1-4/+2
This helps when your target is atually in another location due to synchronization problems.
2009-02-26Merge branch 'aethyra/master'Bjørn Lindeijer1-2/+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-20Removed the last of the image particle guichan fonts.Ira Rice1-2/+4
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-20Added a pickup notification as particle effect. Also make a ui option to ↵Majin Sniper1-0/+12
enable/disable this effect (default is off) and another option to disable the pickup notification in the chat log (default is on).
2009-02-19Added a pickup notification as particle effect. Also make a ui option to ↵Majin Sniper1-0/+12
enable/disable this effect (default is off) and another option to disable the pickup notification in the chat log (default is on).
2009-02-18Introduced a toLower method and grouped string utilsBjørn Lindeijer1-1/+1
The string utility methods are now grouped together in the stringutils.h header. Also, a toLower method was added for convenience.
2009-02-18Merge commit 'aethyra/master'Bjørn Lindeijer1-1/+0
Conflicts: src/net/npchandler.cpp
2009-02-18Introduced a toLower method and grouped string utilsBjørn Lindeijer1-1/+1
The string utility methods are now grouped together in the stringutils.h header. Also, a toLower method was added for convenience.
2009-02-17Fixed an error reported by m0t1k4 which caused a segmentation fault onIra Rice1-1/+0
closing when displaying your own name is turned on. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-16Don't arbitrarily unset player target on NPC deletionBjørn Lindeijer1-5/+5
When an NPC got deleted it would reset the player target. I'm assuming what was meant was to reset the target when the deleted NPC was the target.
2009-02-16Don't arbitrarily unset player target on NPC deletionBjørn Lindeijer1-5/+5
When an NPC got deleted it would reset the player target. I'm assuming what was meant was to reset the target when the deleted NPC was the target.
2009-02-15Removed unnecessary parenthesis at constructorsBjørn Lindeijer1-2/+2
When not passing any parameters to constructors, there is no reason for using parenthesis.
2009-02-15Merge commit 'aethyra/master'Bjørn Lindeijer1-95/+56
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-10Use string::empty() instead of comparing to ""Bjørn Lindeijer1-1/+2
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-11Removed many pointless comparisons with NULLBjørn Lindeijer1-1/+1
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-1/+2
2009-02-10Don't time out targets when attacking.Ira Rice1-1/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-10Simplified target drawing so that it actually uses the SimpleAnimationIra Rice1-94/+55
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-5/+5
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-2/+7
Conflicts: A lot of files...
2009-02-09Mostly whitespace fixesBjørn Lindeijer1-5/+5
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-19/+222
Conflicts: Almost everywhere.
2009-02-07Some more include cleanups.Ira Rice1-2/+6
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Moved mEquipment to the LocalPlayer class, since it's the only placeIra Rice1-0/+1
that uses it anyways. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-24Tweaks to the speech bubbles so that being status (GM, mob, npc,Ira Rice1-0/+1
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-09Removed an unneccessary functionIra Rice1-8/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-09Added the ability to save GM assert state to the client, as requested.Ira Rice1-1/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-09Added the ability to see your own name in game.Ira Rice1-0/+44
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-04Code reformattingBjørn Lindeijer1-4/+1
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. (cherry picked from mainline)
2008-12-17Code reformattingBjørn Lindeijer1-5/+2
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.
2008-12-09Only play status effect sound effects for localplayerFate1-0/+4