[Scummvm-git-logs] scummvm master -> 5a25e445da9590fd1fe6d346fba2dc92925648d1

whiterandrek whiterandrek at gmail.com
Sat Jun 30 16:13:14 CEST 2018


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

Summary:
326f21c1a9 PINK: fixed compiler warnings
5a25e445da PINK: removed empty method call


Commit: 326f21c1a9b731494e9e68a6f2e617a6f5671e49
    https://github.com/scummvm/scummvm/commit/326f21c1a9b731494e9e68a6f2e617a6f5671e49
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2018-06-30T17:12:39+03:00

Commit Message:
PINK: fixed compiler warnings

Changed paths:
    engines/pink/objects/actions/action_loop.cpp


diff --git a/engines/pink/objects/actions/action_loop.cpp b/engines/pink/objects/actions/action_loop.cpp
index 09bea7c..fb84695 100644
--- a/engines/pink/objects/actions/action_loop.cpp
+++ b/engines/pink/objects/actions/action_loop.cpp
@@ -68,7 +68,7 @@ void ActionLoop::update() {
 	switch (_style) {
 	case kPingPong:
 		if (_forward) {
-			if (frame < _stopFrame) {
+			if (frame < (uint)_stopFrame) {
 				decodeNext();
 			} else {
 				_forward = false;
@@ -91,7 +91,7 @@ void ActionLoop::update() {
 		break;
 	}
 	case kForward:
-		if (frame == _stopFrame) {
+		if (frame == (uint)_stopFrame) {
 			setFrame(_startFrame);
 		}
 		decodeNext();


Commit: 5a25e445da9590fd1fe6d346fba2dc92925648d1
    https://github.com/scummvm/scummvm/commit/5a25e445da9590fd1fe6d346fba2dc92925648d1
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2018-06-30T17:12:58+03:00

Commit Message:
PINK: removed empty method call

Changed paths:
    engines/pink/objects/actions/action_loop.cpp


diff --git a/engines/pink/objects/actions/action_loop.cpp b/engines/pink/objects/actions/action_loop.cpp
index fb84695..9635101 100644
--- a/engines/pink/objects/actions/action_loop.cpp
+++ b/engines/pink/objects/actions/action_loop.cpp
@@ -54,7 +54,6 @@ void ActionLoop::toConsole() {
 }
 
 void ActionLoop::update() {
-	ActionCEL::update();
 	uint frame = _decoder.getCurFrame();
 
 	if (!_inLoop) {





More information about the Scummvm-git-logs mailing list