diff --git a/src/otclient/core/game.cpp b/src/otclient/core/game.cpp index 676aef3a..a369e2a0 100644 --- a/src/otclient/core/game.cpp +++ b/src/otclient/core/game.cpp @@ -210,7 +210,6 @@ void Game::processCreatureTeleport(const CreaturePtr& creature) { // stop walking on creature teleports creature->stopWalk(); - dump << "stop walk" << creature->getName(); if(creature == m_localPlayer) m_localPlayer->lockWalk(); diff --git a/src/otclient/core/map.cpp b/src/otclient/core/map.cpp index 455807fa..a98e682c 100644 --- a/src/otclient/core/map.cpp +++ b/src/otclient/core/map.cpp @@ -128,9 +128,6 @@ void Map::addThing(const ThingPtr& thing, const Position& pos, int stackPos) Position oldPos = thing->getPosition(); tile->addThing(thing, stackPos); - // creature teleported - if(creature == g_game.getLocalPlayer()) - dump << "creature move from" << oldPos << "to" << pos; if(oldPos.isValid() && !oldPos.isInRange(pos,1,1)) g_game.processCreatureTeleport(creature); } else if(MissilePtr missile = thing->asMissile()) { diff --git a/src/otclient/core/spritemanager.cpp b/src/otclient/core/spritemanager.cpp index cfbd684b..5716375f 100644 --- a/src/otclient/core/spritemanager.cpp +++ b/src/otclient/core/spritemanager.cpp @@ -39,7 +39,6 @@ bool SpriteManager::load(const std::string& file) g_resources.loadFile(file, m_fin); m_signature = Fw::getU32(m_fin); m_spritesCount = Fw::getU16(m_fin); - dump << m_spritesCount; m_sprites.resize(m_spritesCount); m_loaded = true; return true; diff --git a/src/otclient/core/statictext.cpp b/src/otclient/core/statictext.cpp index 311bd6f6..ee956e90 100644 --- a/src/otclient/core/statictext.cpp +++ b/src/otclient/core/statictext.cpp @@ -37,7 +37,8 @@ void StaticText::draw(const Point& dest, const Rect& parentRect) Rect boundRect = rect; boundRect.bind(parentRect); - if((boundRect.center() - rect.center()).length() < parentRect.width() / 15) { + // draw only if the real center is not too far from the parent center, or its a yell + if((boundRect.center() - rect.center()).length() < parentRect.width() / 15 || m_yell) { //TODO: cache into a framebuffer m_font->renderText(m_text, boundRect, Fw::AlignCenter, m_color); } diff --git a/src/otclient/ui/uigame.cpp b/src/otclient/ui/uigame.cpp index ded52551..40a67707 100644 --- a/src/otclient/ui/uigame.cpp +++ b/src/otclient/ui/uigame.cpp @@ -32,6 +32,7 @@ bool UIGame::onKeyPress(uchar keyCode, int keyboardModifiers, bool wouldFilter) UILineEditPtr chatLineEdit = std::dynamic_pointer_cast(getParent()->recursiveGetChildById("consoleLineEdit")); + //TODO: move this whole shit to lua if(keyboardModifiers == Fw::KeyboardNoModifier) { if(keyCode == Fw::KeyUp || keyCode == Fw::KeyNumpad8) { g_game.walk(Otc::North);