[Scummvm-cvs-logs] scummvm master -> e4e7f1825d2a732bcd96cd9f3865b59d68530554

bluegr bluegr at gmail.com
Fri Jan 8 14:44:44 CET 2016


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e4e7f1825d SCI: Renamed one more function name to conform to our guidelines


Commit: e4e7f1825d2a732bcd96cd9f3865b59d68530554
    https://github.com/scummvm/scummvm/commit/e4e7f1825d2a732bcd96cd9f3865b59d68530554
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2016-01-08T15:43:59+02:00

Commit Message:
SCI: Renamed one more function name to conform to our guidelines

Changed paths:
    engines/sci/graphics/palette32.cpp



diff --git a/engines/sci/graphics/palette32.cpp b/engines/sci/graphics/palette32.cpp
index 4a72df5..54f52d1 100644
--- a/engines/sci/graphics/palette32.cpp
+++ b/engines/sci/graphics/palette32.cpp
@@ -117,7 +117,7 @@ inline PalCycler *GfxPalette32::getCycler(const uint16 fromColor) {
 	return nullptr;
 }
 
-inline void _doCycle(PalCycler *cycler, const int16 speed) {
+inline void doCycleInternal(PalCycler *cycler, const int16 speed) {
 	int16 currentCycle = cycler->currentCycle;
 	const uint16 numColorsToCycle = cycler->numColorsToCycle;
 
@@ -159,7 +159,7 @@ void GfxPalette32::applyCycles() {
 
 		if (cycler->delay != 0 && cycler->numTimesPaused == 0) {
 			while ((cycler->delay + cycler->lastUpdateTick) < g_sci->getTickCount()) {
-				_doCycle(cycler, 1);
+				doCycleInternal(cycler, 1);
 				cycler->lastUpdateTick += cycler->delay;
 			}
 		}
@@ -233,7 +233,7 @@ void GfxPalette32::doCycle(const uint16 fromColor, const int16 speed) {
 	PalCycler *cycler = getCycler(fromColor);
 	if (cycler != nullptr) {
 		cycler->lastUpdateTick = g_sci->getTickCount();
-		_doCycle(cycler, speed);
+		doCycleInternal(cycler, speed);
 	}
 }
 






More information about the Scummvm-git-logs mailing list