[Scummvm-cvs-logs] CVS: residual timer.cpp,1.2,1.3

[James Brown]

Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1611

Modified Files:
	timer.cpp 
Log Message:
Comment out timer assertion for now. (aquadran, is there a PROPER fix for this? :)


Index: timer.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/timer.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- timer.cpp	25 Feb 2004 08:21:31 -0000	1.2
+++ timer.cpp	22 Mar 2004 12:11:42 -0000	1.3
@@ -88,7 +88,11 @@
 			while (_timerSlots[l].counter <= 0) {
 				// A small paranoia check which catches the case where
 				// a timer removes itself (which it never should do).
-				assert(_timerSlots[l].procedure && _timerSlots[l].interval > 0);
+				if (!_timerSlots[l].procedure || _timerSlots[l].interval <= 0) {
+					warning("Timer Assert should have triggered");
+					return 0;
+				}
+				//assert(_timerSlots[l].procedure && _timerSlots[l].interval > 0);
 				_timerSlots[l].counter += _timerSlots[l].interval;
 				_timerSlots[l].procedure(_timerSlots[l].refCon);
 			}