[Scummvm-cvs-logs] SF.net SVN: scummvm:[48278] scummvm/trunk/backends/keymapper/remap-dialog. cpp
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Thu Mar 18 16:05:14 CET 2010
Revision: 48278
http://scummvm.svn.sourceforge.net/scummvm/?rev=48278&view=rev
Author: fingolfin
Date: 2010-03-18 15:05:14 +0000 (Thu, 18 Mar 2010)
Log Message:
-----------
Make keymapper compilable again
Modified Paths:
--------------
scummvm/trunk/backends/keymapper/remap-dialog.cpp
Modified: scummvm/trunk/backends/keymapper/remap-dialog.cpp
===================================================================
--- scummvm/trunk/backends/keymapper/remap-dialog.cpp 2010-03-18 15:04:57 UTC (rev 48277)
+++ scummvm/trunk/backends/keymapper/remap-dialog.cpp 2010-03-18 15:05:14 UTC (rev 48278)
@@ -211,7 +211,7 @@
if (_topAction + i >= _currentActions.size())
return;
- _remapTimeout = getMillis() + kRemapTimeoutDelay;
+ _remapTimeout = g_system->getMillis() + kRemapTimeoutDelay;
_activeRemapAction = _currentActions[_topAction + i].action;
_keymapWidgets[i].keyButton->setLabel("...");
_keymapWidgets[i].keyButton->draw();
@@ -261,7 +261,7 @@
}
void RemapDialog::handleTickle() {
- if (_activeRemapAction && getMillis() > _remapTimeout)
+ if (_activeRemapAction && g_system->getMillis() > _remapTimeout)
stopRemapping();
Dialog::handleTickle();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list