[Scummvm-cvs-logs] scummvm master -> 905e9bc3ed7a82217bf635cce67675e33792f8c6

[Kirben]

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:
905e9bc3ed SCUMM: Add sprite code difference in Moonbase Commander.


Commit: 905e9bc3ed7a82217bf635cce67675e33792f8c6
    https://github.com/scummvm/scummvm/commit/905e9bc3ed7a82217bf635cce67675e33792f8c6
Author: Travis Howell (kirben at optusnet.com.au)
Date: 2011-08-07T18:41:06-07:00

Commit Message:
SCUMM: Add sprite code difference in Moonbase Commander.

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 0b37673..081110c 100644
--- a/engines/scumm/he/sprite_he.cpp
+++ b/engines/scumm/he/sprite_he.cpp
@@ -804,12 +804,18 @@ void Sprite::setSpriteImage(int spriteId, int imageNum) {
 
 	if (_spriteTable[spriteId].image) {
 		_spriteTable[spriteId].imageStateCount = _vm->_wiz->getWizImageStates(_spriteTable[spriteId].image);
-		_spriteTable[spriteId].flags |= kSFActive | kSFAutoAnim | kSFMarkDirty | kSFBlitDirectly;
+
+		if (_vm->VAR(139))
+			_spriteTable[spriteId].flags |= kSFActive;
+		else
+			_spriteTable[spriteId].flags |= kSFActive | kSFAutoAnim | kSFMarkDirty | kSFBlitDirectly;
 
 		if (_spriteTable[spriteId].image != origResId || _spriteTable[spriteId].imageStateCount != origResWizStates)
 			_spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
 	} else {
-		if (_spriteTable[spriteId].flags & kSFImageless)
+		if (_vm->VAR(139))
+			_spriteTable[spriteId].flags &= ~kSFActive;
+		else if (_spriteTable[spriteId].flags & kSFImageless)
 			_spriteTable[spriteId].flags = 0;
 		else
 			_spriteTable[spriteId].flags = kSFChanged | kSFBlitDirectly;