[Scummvm-cvs-logs] SF.net SVN: scummvm:[34786] scummvm/trunk/engines/m4
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Mon Oct 13 00:06:32 CEST 2008
Revision: 34786
http://scummvm.svn.sourceforge.net/scummvm/?rev=34786&view=rev
Author: fingolfin
Date: 2008-10-12 22:06:31 +0000 (Sun, 12 Oct 2008)
Log Message:
-----------
Don't call Common::List::size() if you don't have to (it's an expensive operation, which has to iterate the whole List, while empty() works in constant time)
Modified Paths:
--------------
scummvm/trunk/engines/m4/m4.cpp
scummvm/trunk/engines/m4/viewmgr.h
Modified: scummvm/trunk/engines/m4/m4.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4.cpp 2008-10-12 22:05:26 UTC (rev 34785)
+++ scummvm/trunk/engines/m4/m4.cpp 2008-10-12 22:06:31 UTC (rev 34786)
@@ -205,7 +205,7 @@
uint32 keycode = 0;
if ((event = _events->handleEvents()) != MEVENT_NO_EVENT) {
- if (_viewManager->viewCount() > 0)
+ if (_viewManager->containsViews())
_viewManager->handleMouseEvents(event);
}
Modified: scummvm/trunk/engines/m4/viewmgr.h
===================================================================
--- scummvm/trunk/engines/m4/viewmgr.h 2008-10-12 22:05:26 UTC (rev 34785)
+++ scummvm/trunk/engines/m4/viewmgr.h 2008-10-12 22:06:31 UTC (rev 34786)
@@ -176,7 +176,7 @@
}
bool contains(int screenType) { return getView(screenType) != NULL; }
View *getView(int screenType);
- int viewCount() { return _views.size(); }
+ int containsViews() { return !_views.empty(); }
void showTextView(const char *textViewName, bool returnToMainMenu = true);
void showAnimView(const char *animViewName, bool returnToMainMenu = true);
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