[Scummvm-git-logs] scummvm master -> acbfb7d141a541481aebfced32d0cc4037b16e07

sev- sev at scummvm.org
Sun Sep 29 00:36:17 CEST 2019


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:
547122f738 MACGUI: Added sanity check to 9-patch recalculatuon
acbfb7d141 WAGE: Updated border files


Commit: 547122f73897ecad0dadc77000fca0bf4594f1a4
    https://github.com/scummvm/scummvm/commit/547122f73897ecad0dadc77000fca0bf4594f1a4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-09-29T00:35:13+02:00

Commit Message:
MACGUI: Added sanity check to 9-patch recalculatuon

Changed paths:
    graphics/nine_patch.cpp


diff --git a/graphics/nine_patch.cpp b/graphics/nine_patch.cpp
index d521df9..ddaf9ab 100644
--- a/graphics/nine_patch.cpp
+++ b/graphics/nine_patch.cpp
@@ -128,7 +128,7 @@ void NinePatchSide::calcOffsets(int len) {
 		dest_offset += _m[i]->dest_length;
 	}
 
-	if (remaining_stretch) {
+	if (remaining_stretch && _m.size()) {
 		_m[j]->dest_length += remaining_stretch;
 		if (j + 1 < _m.size())
 			_m[j + 1]->dest_offset += remaining_stretch;


Commit: acbfb7d141a541481aebfced32d0cc4037b16e07
    https://github.com/scummvm/scummvm/commit/acbfb7d141a541481aebfced32d0cc4037b16e07
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-09-29T00:35:49+02:00

Commit Message:
WAGE: Updated border files

Changed paths:
    devtools/create_wage/wage_border_act.bmp
    devtools/create_wage/wage_border_inact.bmp


diff --git a/devtools/create_wage/wage_border_act.bmp b/devtools/create_wage/wage_border_act.bmp
index a1247bb..a66906d 100644
Binary files a/devtools/create_wage/wage_border_act.bmp and b/devtools/create_wage/wage_border_act.bmp differ
diff --git a/devtools/create_wage/wage_border_inact.bmp b/devtools/create_wage/wage_border_inact.bmp
index 3851833..3a764f7 100644
Binary files a/devtools/create_wage/wage_border_inact.bmp and b/devtools/create_wage/wage_border_inact.bmp differ





More information about the Scummvm-git-logs mailing list