Merge branch 'eathena/master'

Conflicts:
	A lot of files.

1 files changed, 2 insertions, 0 deletions

diff --git a/src/game.h b/src/game.h
index 7eecc036..c537d147 100644
--- a/src/game.h
+++ b/src/game.h
@@ -83,6 +83,8 @@ class Game : public ConfigListener
         MessageHandlerPtr mPostHandler;
         MessageHandlerPtr mTradeHandler;
 
+        int mLastTarget;
+
         SDL_TimerID mLogicCounterId;
         SDL_TimerID mSecondsCounterId;
 };