[Scummvm-git-logs] scummvm master -> 56890bfb9f40df8cc78e0c1b91b32a6f5b4f8ca1

dreammaster dreammaster at scummvm.org
Sun Jun 25 18:49:25 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:
56890bfb9f TITANIC: Set PET area title positions for German version


Commit: 56890bfb9f40df8cc78e0c1b91b32a6f5b4f8ca1
    https://github.com/scummvm/scummvm/commit/56890bfb9f40df8cc78e0c1b91b32a6f5b4f8ca1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-06-25T12:49:12-04:00

Commit Message:
TITANIC: Set PET area title positions for German version

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 bc8d87b..ffc2c7b 100644
--- a/engines/titanic/pet_control/pet_frame.cpp
+++ b/engines/titanic/pet_control/pet_frame.cpp
@@ -56,7 +56,7 @@ bool CPetFrame::reset() {
 			_modeButtons[idx].reset(resName, _petControl, MODE_SELECTED);
 		}
 
-		for (uint idx = 0; idx < 7; ++idx) {
+		for (uint idx = 0; idx < ARRAYSIZE(_titles); ++idx) {
 			CString resName = Common::String::format("3Pettitle%d", idx + 1);
 			_titles[idx].setup(MODE_UNSELECTED, resName, _petControl);
 		}
@@ -130,10 +130,11 @@ bool CPetFrame::setPetControl(CPetControl *petControl) {
 		}
 		_modeButtons[PET_CONVERSATION].setMode(MODE_SELECTED);
 
-		const int XLIST[] = { 73, 54, 85, 109, 38, 71 };
-		for (int idx = 0; idx < 6; ++idx) {
+		const int XLIST_EN[] = { 73, 54, 85, 109, 38, 71 };
+		for (uint idx = 0; idx < _petAreas.size(); ++idx) {
 			_titles[idx].setBounds(Rect(0, 0, 110, 11));
-			_titles[idx].translate(600 - XLIST[idx], 471);
+			_titles[idx].translate(g_vm->isGerman() ? 608 - 107 :
+				608 - XLIST_EN[idx], 471);
 		}
 	}
 





More information about the Scummvm-git-logs mailing list