Merged 0.0 changes from revision 3065 to 3177 to trunk.

1 files changed, 11 insertions, 0 deletions

diff --git a/src/localplayer.h b/src/localplayer.h
index 980b1aff..9ce67d13 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -35,6 +35,9 @@ class FloorItem;
 class Inventory;
 class Item;
 
+/**
+ * The local player character.
+ */
 class LocalPlayer : public Player
 {
     public:
@@ -110,9 +113,17 @@ class LocalPlayer : public Player
         void setTrading(bool trading) { mTrading = trading; }
 
         void attack();
+
         Being* getTarget() const;
 
         /**
+         * Overridden to do nothing. The attacks of the local player are
+         * displayed as soon as the player attacks, not when the server says
+         * the player does.
+         */
+        virtual void handleAttack() {}
+
+        /**
          * Sets the target being of the player.
          */
         void setTarget(Being* target) { mTarget = target; }