[Scummvm-git-logs] scummvm master -> 9913c91d3a827c10e86d0ebf2fde9ea53541f9c6

dreammaster dreammaster at scummvm.org
Sat Dec 3 01:55:00 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:
9913c91d3a TITANIC: Fix changing inventory glyphs positions when dragging one


Commit: 9913c91d3a827c10e86d0ebf2fde9ea53541f9c6
    https://github.com/scummvm/scummvm/commit/9913c91d3a827c10e86d0ebf2fde9ea53541f9c6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-02T19:54:49-05:00

Commit Message:
TITANIC: Fix changing inventory glyphs positions when dragging one

Changed paths:
    engines/titanic/pet_control/pet_glyphs.cpp


diff --git a/engines/titanic/pet_control/pet_glyphs.cpp b/engines/titanic/pet_control/pet_glyphs.cpp
index 5cc428b..ed04381 100644
--- a/engines/titanic/pet_control/pet_glyphs.cpp
+++ b/engines/titanic/pet_control/pet_glyphs.cpp
@@ -558,8 +558,8 @@ void CPetGlyphs::removeInvalid() {
 			}
 		}
 
-		_firstVisibleIndex = CLIP(_firstVisibleIndex, 0,
-			(int)size() - _numVisibleGlyphs);
+		int max = MAX((int)size() - _numVisibleGlyphs, 0);
+		_firstVisibleIndex = CLIP(_firstVisibleIndex, 0, max);
 	}
 }
 





More information about the Scummvm-git-logs mailing list