[Scummvm-cvs-logs] CVS: scummvm/sky control.cpp,1.98.2.2,1.98.2.3
Joost Peters
joostp at users.sourceforge.net
Mon Nov 21 10:35:01 CET 2005
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3382/sky
Modified Files:
Tag: branch-0-8-0
control.cpp
Log Message:
backport slider fix to 0.8.0 branch
Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.cpp,v
retrieving revision 1.98.2.2
retrieving revision 1.98.2.3
diff -u -d -r1.98.2.2 -r1.98.2.3
--- control.cpp 26 Oct 2005 06:08:37 -0000 1.98.2.2
+++ control.cpp 21 Nov 2005 18:33:55 -0000 1.98.2.3
@@ -332,7 +332,8 @@
return;
}
if (_curButtonText != pButton->_text) {
- if (_textSprite) free(_textSprite);
+ if (_textSprite)
+ free(_textSprite);
_textSprite = NULL;
_curButtonText = pButton->_text;
if (pButton->_text) {
@@ -345,9 +346,11 @@
}
_textSprite = (dataFileHeader *)textRes.textData;
_text->setSprite(_textSprite);
- } else _text->setSprite(NULL);
+ } else
+ _text->setSprite(NULL);
}
- _text->setXY(_mouseX + 12, _mouseY - 16);
+ int destY = (_mouseY - 16 >= 0) ? _mouseY - 16 : 0;
+ _text->setXY(_mouseX + 12, destY);
}
void Control::drawTextCross(uint32 flags) {
More information about the Scummvm-git-logs
mailing list