[Scummvm-cvs-logs] CVS: scummvm/gui PopUpWidget.cpp,1.13,1.14

Max Horn fingolfin at users.sourceforge.net
Tue Aug 5 17:29:05 CEST 2003


Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv1282/gui

Modified Files:
	PopUpWidget.cpp 
Log Message:
get rid of some g_system usage

Index: PopUpWidget.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/PopUpWidget.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- PopUpWidget.cpp	31 Jul 2003 18:35:00 -0000	1.13
+++ PopUpWidget.cpp	6 Aug 2003 00:28:00 -0000	1.14
@@ -104,7 +104,7 @@
 	_clickY = clickY - _y;
 
 	// Time the popup was opened
-	_openTime = g_system->get_msecs();
+	_openTime = _gui->get_time();
 }
 
 void PopUpDialog::drawDialog() {
@@ -127,7 +127,7 @@
 	// Mouse was released. If it wasn't moved much since the original mouse down, 
 	// let the popup stay open. If it did move, assume the user made his selection.
 	int dist = (_clickX - x) * (_clickX - x) + (_clickY - y) * (_clickY - y);
-	if (dist > 3 * 3 || g_system->get_msecs() - _openTime > 300) {
+	if (dist > 3 * 3 || _gui->get_time() - _openTime > 300) {
 		setResult(_selection);
 		close();
 	}





More information about the Scummvm-git-logs mailing list