[Scummvm-cvs-logs] scummvm master -> 3416f67b89cbf670228f0f0d270bbb3f7ab1b3ee

m-kiewitz m_kiewitz at users.sourceforge.net
Tue Feb 9 19:55:58 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:
3416f67b89 AGI: Fix invalid coordinate warnings for sprites


Commit: 3416f67b89cbf670228f0f0d270bbb3f7ab1b3ee
    https://github.com/scummvm/scummvm/commit/3416f67b89cbf670228f0f0d270bbb3f7ab1b3ee
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2016-02-09T19:56:13+01:00

Commit Message:
AGI: Fix invalid coordinate warnings for sprites

Changed paths:
    engines/agi/sprite.cpp



diff --git a/engines/agi/sprite.cpp b/engines/agi/sprite.cpp
index 09935c9..434cf1b 100644
--- a/engines/agi/sprite.cpp
+++ b/engines/agi/sprite.cpp
@@ -110,7 +110,7 @@ void SpritesMgr::buildSpriteListAdd(uint16 givenOrderNr, ScreenObjEntry *screenO
 	// Checking, if xPos/yPos/right/bottom are valid and do not go outside of playscreen (visual screen)
 	// Original AGI did not do this (but it then resulted in memory corruption)
 	if (spriteEntry.xPos < 0) {
-		warning("buildSpriteListAdd(): ignoring screen obj %d, b/c xPos < 0", screenObj->objectNr, spriteEntry.xPos);
+		warning("buildSpriteListAdd(): ignoring screen obj %d, b/c xPos (%d) < 0", screenObj->objectNr, spriteEntry.xPos);
 		return;
 	}
 	if (spriteEntry.yPos < 0) {
@@ -119,12 +119,12 @@ void SpritesMgr::buildSpriteListAdd(uint16 givenOrderNr, ScreenObjEntry *screenO
 	}
 	int16 xRight = spriteEntry.xPos + spriteEntry.xSize;
 	if (xRight > SCRIPT_HEIGHT) {
-		warning("buildSpriteListAdd(): ignoring screen obj %d, b/c rightPos > %d", screenObj->objectNr, xRight, SCRIPT_WIDTH);
+		warning("buildSpriteListAdd(): ignoring screen obj %d, b/c rightPos (%d) > %d", screenObj->objectNr, xRight, SCRIPT_WIDTH);
 		return;
 	}
 	int16 yBottom = spriteEntry.yPos + spriteEntry.ySize;
 	if (yBottom > SCRIPT_HEIGHT) {
-		warning("buildSpriteListAdd(): ignoring screen obj %d, b/c bottomPos > %d", screenObj->objectNr, yBottom, SCRIPT_HEIGHT);
+		warning("buildSpriteListAdd(): ignoring screen obj %d, b/c bottomPos (%d) > %d", screenObj->objectNr, yBottom, SCRIPT_HEIGHT);
 		return;
 	}
 






More information about the Scummvm-git-logs mailing list