[Scummvm-cvs-logs] SF.net SVN: scummvm: [31988] scummvm/trunk/engines/kyra

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Sat May 10 21:57:50 CEST 2008


Revision: 31988
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31988&view=rev
Author:   eriktorbjorn
Date:     2008-05-10 12:57:49 -0700 (Sat, 10 May 2008)

Log Message:
-----------
Fixed warning.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/timer.cpp
    scummvm/trunk/engines/kyra/timer.h

Modified: scummvm/trunk/engines/kyra/timer.cpp
===================================================================
--- scummvm/trunk/engines/kyra/timer.cpp	2008-05-10 19:41:26 UTC (rev 31987)
+++ scummvm/trunk/engines/kyra/timer.cpp	2008-05-10 19:57:49 UTC (rev 31988)
@@ -62,15 +62,15 @@
 };
 } // end of anonymous namespace
 
-void TimerManager::pause(bool pause) {
-	if (pause) {
+void TimerManager::pause(bool p) {
+	if (p) {
 		++_isPaused;
 
 		if (_isPaused == 1) {
 			_isPaused = true;
 			_pauseStart = _system->getMillis();
 		}
-	} else if (!pause && _isPaused > 0) {
+	} else if (!p && _isPaused > 0) {
 		--_isPaused;
 
 		if (_isPaused == 0) {

Modified: scummvm/trunk/engines/kyra/timer.h
===================================================================
--- scummvm/trunk/engines/kyra/timer.h	2008-05-10 19:41:26 UTC (rev 31987)
+++ scummvm/trunk/engines/kyra/timer.h	2008-05-10 19:57:49 UTC (rev 31988)
@@ -52,7 +52,7 @@
 	TimerManager(KyraEngine *vm, OSystem *sys) : _vm(vm), _system(sys), _timers(), _nextRun(0), _isPaused(0), _pauseStart(0) {}
 	~TimerManager() { reset(); }
 
-	void pause(bool pause);
+	void pause(bool p);
 
 	void reset();
 


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