1 files changed, 2 insertions, 16 deletions

diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index d954b99f..68b5fed3 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -202,9 +202,7 @@ void Viewport::draw(gcn::Graphics *gcnGraphics)
             mMap->drawCollision(graphics,
                                 (int) mPixelViewX,
                                 (int) mPixelViewY);
-#if EATHENA_SUPPORT
             drawDebugPath(graphics);
-#endif
         }
     }
 
@@ -364,24 +362,12 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
                     if (player_node->withinAttackRange(being) ||
                         keyboard.isKeyActive(keyboard.KEY_ATTACK))
                     {
-                        player_node->setGotoTarget(being);
-//TODO: This can be changed when TMWServ moves to target based combat
-#ifdef TMWSERV_SUPPORT 
-                        player_node->attack();
-#else
                         player_node->attack(being,
                             !keyboard.isKeyActive(keyboard.KEY_TARGET));
-#endif
-
                     }
                     else
                     {
-#ifdef TMWSERV_SUPPORT
-                        player_node->setDestination(event.getX() + (int) mPixelViewX, 
-                                                    event.getY() + (int) mPixelViewY);
-#else
-                        player_node->setDestination(tilex, tiley);
-#endif
+                        player_node->setGotoTarget(being);
                     }
                     break;
                 default:
@@ -410,9 +396,9 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
                                             event.getY() + (int) mPixelViewY);
             }
 #else
-            player_node->stopAttack();
             player_node->setDestination(tilex, tiley);
 #endif
+            player_node->stopAttack();
             mPlayerFollowMouse = true;
         }
     }