summaryrefslogtreecommitdiff
path: root/src/gui/viewport.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-10-17 22:07:24 +0300
committerAndrei Karas <akaras@inbox.ru>2011-10-17 22:07:24 +0300
commitd14bb7a27ee23cc83b3af1db2f1976eaaa55d78a (patch)
tree5f128768c66436eefd70632f02889607596609d4 /src/gui/viewport.cpp
parentf1e92aca00a4859047e83fab76220767b9a2f814 (diff)
parente93e6beb456d105987da3190c2a80847b6900081 (diff)
downloadmanaplus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.gz
manaplus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.bz2
manaplus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.xz
manaplus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.zip
Merge branch 'master' into strippedstripped1.1.10.16
Conflicts: data/fonts/mplus-1p-bold.ttf data/fonts/mplus-1p-regular.ttf
Diffstat (limited to 'src/gui/viewport.cpp')
-rw-r--r--src/gui/viewport.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 461dd581d..97a467add 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -195,8 +195,8 @@ void Viewport::draw(gcn::Graphics *gcnGraphics)
{
if (player_x <= 0 || player_y <= 0)
{
- if (debugChatTab)
- debugChatTab->chatLog("incorrect player position!");
+// if (debugChatTab)
+// debugChatTab->chatLog("incorrect player position!");
logger->log("incorrect player position: %d, %d, %d, %d",
player_x, player_y, (int)mPixelViewX, (int)mPixelViewY);
if (player_node)