[Scummvm-cvs-logs] scummvm master -> 50940f13ae8563e4ec4cd811267d393122c0a956

Kirben kirben at optusnet.com.au
Tue Jul 22 02:29:01 CEST 2014


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:
50940f13ae SCUMM: Add HE100 differences when resetting sprites.


Commit: 50940f13ae8563e4ec4cd811267d393122c0a956
    https://github.com/scummvm/scummvm/commit/50940f13ae8563e4ec4cd811267d393122c0a956
Author: Kirben (kirben at optusnet.com.au)
Date: 2014-07-22T10:24:32+10:00

Commit Message:
SCUMM: Add HE100 differences when resetting sprites.

Changed paths:
    engines/scumm/he/sprite_he.cpp



diff --git a/engines/scumm/he/sprite_he.cpp b/engines/scumm/he/sprite_he.cpp
index 218f2ec5..f902b67 100644
--- a/engines/scumm/he/sprite_he.cpp
+++ b/engines/scumm/he/sprite_he.cpp
@@ -793,6 +793,11 @@ void Sprite::resetSprite(int spriteId) {
 	_spriteTable[spriteId].field_84 = 0;
 	_spriteTable[spriteId].imgFlags = 0;
 	_spriteTable[spriteId].field_90 = 0;
+
+	if (_vm->_game.heversion >= 100) {
+		_spriteTable[spriteId].flags &= ~kSFMarkDirty;
+		_spriteTable[spriteId].flags |= kSFAutoAnim | kSFBlitDirectly;
+	}
 }
 
 void Sprite::setSpriteImage(int spriteId, int imageNum) {
@@ -820,6 +825,8 @@ void Sprite::setSpriteImage(int spriteId, int imageNum) {
 	} else {
 		if (_vm->VAR(139))
 			_spriteTable[spriteId].flags &= ~kSFActive;
+		else if (_vm->_game.heversion >= 100 && origResId == 0)
+			_spriteTable[spriteId].flags = 0;
 		else if (_spriteTable[spriteId].flags & kSFImageless)
 			_spriteTable[spriteId].flags = 0;
 		else






More information about the Scummvm-git-logs mailing list