Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-10-15 03:54:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Some fixes in entergame and widget clipping

Browse Source
This commit is contained in:
Eduardo Bart
2013-01-22 19:48:25 -02:00
parent ca4caf7991
commit 27d5506262
5 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/client/game.h
View File

@@ -272,6 +272,7 @@ public:
bool checkBotProtection();
bool isOnline() { return m_online; }
bool isLogging() { return !m_online && m_protocolGame; }
bool isDead() { return m_dead; }
bool isAttacking() { return !!m_attackingCreature; }
bool isFollowing() { return !!m_followingCreature; }

1
src/client/luafunctions.cpp
View File

@@ -212,6 +212,7 @@ void Client::registerLuaFunctions()
g_lua.bindSingletonFunction("g_game", "canReportBugs", &Game::canReportBugs, &g_game);
g_lua.bindSingletonFunction("g_game", "checkBotProtection", &Game::checkBotProtection, &g_game);
g_lua.bindSingletonFunction("g_game", "isOnline", &Game::isOnline, &g_game);
g_lua.bindSingletonFunction("g_game", "isLogging", &Game::isLogging, &g_game);
g_lua.bindSingletonFunction("g_game", "isDead", &Game::isDead, &g_game);
g_lua.bindSingletonFunction("g_game", "isAttacking", &Game::isAttacking, &g_game);
g_lua.bindSingletonFunction("g_game", "isFollowing", &Game::isFollowing, &g_game);

10
src/framework/ui/uiwidget.cpp
View File

@@ -55,8 +55,11 @@ UIWidget::~UIWidget()
void UIWidget::draw(const Rect& visibleRect, Fw::DrawPane drawPane)
{
if(m_clipping)
Rect oldClipRect;
if(m_clipping) {
oldClipRect = g_painter->getClipRect();
g_painter->setClipRect(visibleRect);
}
if(m_rotation != 0.0f) {
g_painter->pushTransformMatrix();
@@ -75,8 +78,9 @@ void UIWidget::draw(const Rect& visibleRect, Fw::DrawPane drawPane)
if(m_rotation != 0.0f)
g_painter->popTransformMatrix();
if(m_clipping)
g_painter->resetClipRect();
if(m_clipping) {
g_painter->setClipRect(oldClipRect);
}
}
void UIWidget::drawSelf(Fw::DrawPane drawPane)