From 3aacd9d43cb7be5305e290a73e8d764d2ffc579e Mon Sep 17 00:00:00 2001
From: Eduardo Bart <edub4rt@gmail.com>
Date: Fri, 23 Mar 2012 19:02:58 -0300
Subject: [PATCH] console fixes

---
 modules/game_console/console.lua | 4 +++-
 src/otclient/core/map.cpp        | 6 ++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/game_console/console.lua b/modules/game_console/console.lua
index 461a7d1f..6d716c59 100644
--- a/modules/game_console/console.lua
+++ b/modules/game_console/console.lua
@@ -226,6 +226,7 @@ function Console.clear()
     end
   end
   channels = {}
+  channels[0] = 'Default'
 
   consoleTabBar:getTab('Default').tabPanel:destroyChildren()
   consoleTabBar:getTab('Server Log').tabPanel:destroyChildren()
@@ -317,7 +318,7 @@ function Console.addText(text, speaktype, tabName)
 end
 
 function Console.addTabText(text, speaktype, tab)
-  if Options['showTimestampsInConsole'] then
+  if Options.getOption('showTimestampsInConsole') then
     text = os.date('%H:%M') .. ' ' .. text
   end
 
@@ -326,6 +327,7 @@ function Console.addTabText(text, speaktype, tab)
   label:setText(text)
   label:setColor(speaktype.color)
   consoleTabBar:blinkTab(tab)
+  print 'yeah'
 
   if panel:getChildCount() > 10 then
     panel:removeChild(panel:getFirstChild())
diff --git a/src/otclient/core/map.cpp b/src/otclient/core/map.cpp
index c4aaa9a9..72706055 100644
--- a/src/otclient/core/map.cpp
+++ b/src/otclient/core/map.cpp
@@ -436,11 +436,9 @@ std::vector<Otc::Direction> Map::findPath(const Position& startPos, const Positi
 
     std::vector<Otc::Direction> dirs;
 
-    if(startPos == goalPos || startPos.z != goalPos.z || startPos.distance(goalPos) > maxSteps) {
+    if(startPos == goalPos || startPos.z != goalPos.z || startPos.distance(goalPos) > maxSteps)
         return dirs;
-    }
 
-    auto estimateCost = [=](const Position& pos) { return pos.distance(goalPos); };
     std::unordered_map<Position, Node*, PositionHasher> nodes;
     std::priority_queue<Node*, std::vector<Node*>, LessNode> searchList;
 
@@ -486,7 +484,7 @@ std::vector<Otc::Direction> Map::findPath(const Position& startPos, const Positi
                 neighborNode->prev = currentNode;
                 neighborNode->cost = cost;
                 neighborNode->steps = currentNode->steps + 1;
-                neighborNode->totalCost = neighborNode->cost + estimateCost(neighborPos);
+                neighborNode->totalCost = neighborNode->cost + neighborPos.distance(goalPos);
                 neighborNode->dir = walkDir;
                 neighborNode->evaluated = false;
                 searchList.push(neighborNode);