[Scummvm-cvs-logs] scummvm master -> c809a65b93d23aa30296f7f22ef4b160f628b9aa

sev- sev at scummvm.org
Thu Jan 14 00:30:24 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:
c809a65b93 SCUMM: Fix Russian Zak


Commit: c809a65b93d23aa30296f7f22ef4b160f628b9aa
    https://github.com/scummvm/scummvm/commit/c809a65b93d23aa30296f7f22ef4b160f628b9aa
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-01-14T00:24:53+01:00

Commit Message:
SCUMM: Fix Russian Zak

Changed paths:
    engines/scumm/charset-fontdata.cpp



diff --git a/engines/scumm/charset-fontdata.cpp b/engines/scumm/charset-fontdata.cpp
index 3c48314..23e89b1 100644
--- a/engines/scumm/charset-fontdata.cpp
+++ b/engines/scumm/charset-fontdata.cpp
@@ -617,7 +617,7 @@ CharsetRendererV2::CharsetRendererV2(ScummEngine *vm, Common::Language language)
 		replacementChars = sizeof(spanishCharsetDataV2) / 2;
 		break;
 	case Common::RU_RUS:
-		if ((_vm->_game.id == GID_MANIAC) && (_vm->_game.version == 2)) {
+		if (((_vm->_game.id == GID_MANIAC) || (_vm->_game.id == GID_ZAK)) && (_vm->_game.version == 2)) {
 			replacementData = russCharsetDataV2;
 			replacementChars = sizeof(russCharsetDataV2) / 2;
 		} else {
@@ -638,7 +638,7 @@ CharsetRendererV2::CharsetRendererV2(ScummEngine *vm, Common::Language language)
 			int ch1 = replacementData[2 * i];
 			int ch2 = replacementData[2 * i + 1];
 
-			if ((_vm->_game.id == GID_MANIAC) && (_vm->_game.version == 2)) {
+			if (((_vm->_game.id == GID_MANIAC) || (_vm->_game.id == GID_ZAK)) && (_vm->_game.version == 2)) {
 				memcpy(const_cast<byte *>(_fontPtr) + 8 * ch1, russianCharsetDataV2 + 8 * ch2, 8);
 			} else {
 				memcpy(const_cast<byte *>(_fontPtr) + 8 * ch1, specialCharsetData + 8 * ch2, 8);






More information about the Scummvm-git-logs mailing list