[Scummvm-cvs-logs] CVS: scummvm/backends/sdl graphics.cpp,1.50,1.51
Eugene Sandulenko
sev at users.sourceforge.net
Fri Jul 8 23:45:05 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm NEWS,1.125,1.126
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga game.cpp,1.73,1.74 saga.h,1.102,1.103 scene.cpp,1.118,1.119 sfuncs.cpp,1.135,1.136
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/backends/sdl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3179
Modified Files:
graphics.cpp
Log Message:
Commited patch to fix bug #1210836: "ALL: Failed assertion in AdvMame scaler".
Thanks cyx for actual fixing.
Index: graphics.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/graphics.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- graphics.cpp 5 Jul 2005 20:51:53 -0000 1.50
+++ graphics.cpp 9 Jul 2005 06:44:00 -0000 1.51
@@ -1430,25 +1430,17 @@
}
void OSystem_SDL::undrawMouse() {
+ const int x = _mouseBackup.x;
+ const int y = _adjustAspectRatio ? aspect2Real(_mouseBackup.y) : _mouseBackup.y;
+
// When we switch bigger overlay off mouse jumps. Argh!
- // this intended to prevent undrawing offscreen mouse
- if (!_overlayVisible) {
- if (_adjustAspectRatio) {
- if (_mouseBackup.x > _screenWidth || aspect2Real(_mouseBackup.y) > _screenHeight)
- return;
- } else {
- if (_mouseBackup.x > _screenWidth || _mouseBackup.y > _screenHeight)
- return;
- }
+ // This is intended to prevent undrawing offscreen mouse
+ if (!_overlayVisible && (x >= _screenWidth || y >= _screenHeight)) {
+ return;
}
-
- if (_mouseBackup.w) {
- if (_adjustAspectRatio)
- addDirtyRect(_mouseBackup.x, aspect2Real(_mouseBackup.y), _mouseBackup.w,
- _mouseBackup.h);
- else
- addDirtyRect(_mouseBackup.x, _mouseBackup.y, _mouseBackup.w,
- _mouseBackup.h);
+
+ if (_mouseBackup.w != 0 && _mouseBackup.h != 0) {
+ addDirtyRect(x, y, _mouseBackup.w, _mouseBackup.h);
}
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm NEWS,1.125,1.126
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga game.cpp,1.73,1.74 saga.h,1.102,1.103 scene.cpp,1.118,1.119 sfuncs.cpp,1.135,1.136
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list