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

dreammaster dreammaster at scummvm.org
Sat Aug 12 03:37:40 CEST 2017


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:
5d9da668d4 TITANIC: Fix highlighting PET tab icons during load or Deskbot conv


Commit: 5d9da668d418868bba8b9a6ddf5d2f7748f5cc59
    https://github.com/scummvm/scummvm/commit/5d9da668d418868bba8b9a6ddf5d2f7748f5cc59
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-11T21:37:34-04:00

Commit Message:
TITANIC: Fix highlighting PET tab icons during load or Deskbot conv

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


diff --git a/engines/titanic/pet_control/pet_frame.cpp b/engines/titanic/pet_control/pet_frame.cpp
index ffc2c7b..9088cfe 100644
--- a/engines/titanic/pet_control/pet_frame.cpp
+++ b/engines/titanic/pet_control/pet_frame.cpp
@@ -128,7 +128,7 @@ bool CPetFrame::setPetControl(CPetControl *petControl) {
 			_modeButtons[idx].setBounds(r);
 			_modeButtons[idx].translate(4, g_vm->isGerman() ? YLIST_DE[idx] : YLIST_EN[idx]);
 		}
-		_modeButtons[PET_CONVERSATION].setMode(MODE_SELECTED);
+		setArea(PET_CONVERSATION);
 
 		const int XLIST_EN[] = { 73, 54, 85, 109, 38, 71 };
 		for (uint idx = 0; idx < _petAreas.size(); ++idx) {
@@ -143,7 +143,7 @@ bool CPetFrame::setPetControl(CPetControl *petControl) {
 
 void CPetFrame::setArea(PetArea newArea) {
 	resetArea();
-	if ((uint)newArea < (_petAreas.size() - 1))
+	if ((uint)newArea < _petAreas.size())
 		_modeButtons[_petAreas[newArea]].setMode(MODE_SELECTED);
 }
 





More information about the Scummvm-git-logs mailing list