[Scummvm-git-logs] scummvm master -> 8b5196da53f2e9f92f5a6f22a1073833e51123f9

[sev-]

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:
979560e304 DIRECTOR: Lingo: Added stub for Lingo restarting
8b5196da53 DIRECTOR: Added debug output for Shared Cast images


Commit: 979560e304fef2ff978b8019a510a4f2a13ed49e
    https://github.com/scummvm/scummvm/commit/979560e304fef2ff978b8019a510a4f2a13ed49e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-01-16T00:51:37+01:00

Commit Message:
DIRECTOR: Lingo: Added stub for Lingo restarting

Changed paths:
    engines/director/lingo/lingo-funcs.cpp
    engines/director/lingo/lingo.cpp
    engines/director/lingo/lingo.h


diff --git a/engines/director/lingo/lingo-funcs.cpp b/engines/director/lingo/lingo-funcs.cpp
index a71eb3d..d9e9ee4 100644
--- a/engines/director/lingo/lingo-funcs.cpp
+++ b/engines/director/lingo/lingo-funcs.cpp
@@ -179,6 +179,8 @@ void Lingo::func_goto(Datum &frame, Datum &movie) {
 			return;
 		}
 
+		restartLingo();
+
 		delete _vm->_currentScore;
 
 		Archive *mov = _vm->openMainArchive(*movie.u.s);
diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index 01b6207..1416b14 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -306,6 +306,27 @@ void Lingo::processEvent(LEvent event, ScriptType st, int entityId) {
 	}
 }
 
+void Lingo::restartLingo() {
+	warning("STUB: restartLingo()");
+
+	// TODO
+	//
+	// reset the following:
+	// the keyDownScript
+	// the mouseUpScript
+	// the mouseDownScript
+	// the beepOn
+	// the constraint properties
+	// the cursor
+	// the immediate sprite properties
+	// the puppetSprite
+	// cursor commands
+	// custom menus
+	//
+	// NOTE:
+	// tuneousScript is not reset
+}
+
 int Lingo::alignTypes(Datum &d1, Datum &d2) {
 	int opType = INT;
 
diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index 552a1d6..a739ee7 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -509,6 +509,8 @@ private:
 	void push(Datum d);
 	Datum pop(void);
 
+	void restartLingo();
+
 	Common::HashMap<uint32, const char *> _eventHandlerTypes;
 	Common::HashMap<Common::String, uint32> _eventHandlerTypeIds;
 	Common::HashMap<Common::String, Audio::AudioStream *> _audioAliases;


Commit: 8b5196da53f2e9f92f5a6f22a1073833e51123f9
    https://github.com/scummvm/scummvm/commit/8b5196da53f2e9f92f5a6f22a1073833e51123f9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-01-16T00:51:37+01:00

Commit Message:
DIRECTOR: Added debug output for Shared Cast images

Changed paths:
    engines/director/frame.cpp


diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index 4a478de..c58ae7d 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -601,6 +601,7 @@ void Frame::renderSprites(Graphics::ManagedSurface &surface, bool renderTrail) {
 				BitmapCast *bitmapCast = static_cast<BitmapCast *>(_sprites[i]->_cast);
 				//TODO: might want a quicker way to determine if cast is from Shared Cast.
 				if (_vm->getSharedBMP() != NULL && _vm->getSharedBMP()->contains(_sprites[i]->_castId + 1024)) {
+					debugC(2, kDebugImages, "Shared cast sprite BMP: id: %d", _sprites[i]->_castId + 1024);
 					bitmapCast = static_cast<BitmapCast *>(_vm->getSharedCasts()->getVal(_sprites[i]->_castId));
 				}
 
@@ -719,6 +720,7 @@ Image::ImageDecoder *Frame::getImageFrom(uint16 spriteId) {
 	BitmapCast *bc = NULL;
 
 	if (_vm->getSharedBMP() != NULL && _vm->getSharedBMP()->contains(imgId)) {
+		debugC(2, kDebugImages, "Shared cast BMP: id: %d", imgId);
 		pic = _vm->getSharedBMP()->getVal(imgId);
 		bc = static_cast<BitmapCast *>(_vm->getSharedCasts()->getVal(spriteId));
 	} else 	if (_vm->_currentScore->getArchive()->hasResource(MKTAG('B', 'I', 'T', 'D'), imgId)) {
@@ -875,9 +877,9 @@ void Frame::renderText(Graphics::ManagedSurface &surface, uint16 spriteId, Commo
 	debugC(3, kDebugText, "renderText: x: %d y: %d w: %d h: %d font: '%s'", x, y, width, height, _vm->_wm->_fontMan->getFontName(macFont));
 
 	int alignment = (int)textCast->textAlign;
-	if (alignment == -1) 
+	if (alignment == -1)
 		alignment = 3;
-	else 
+	else
 		alignment++;
 
 	uint16 textX = x, textY = y;
@@ -897,12 +899,12 @@ void Frame::renderText(Graphics::ManagedSurface &surface, uint16 spriteId, Commo
 			width += padding * 2;
 			height += padding;
 
-			if (textCast->textAlign == kTextAlignLeft) 
+			if (textCast->textAlign == kTextAlignLeft)
 				textX += padding;
-			else if (textCast->textAlign == kTextAlignRight) 
+			else if (textCast->textAlign == kTextAlignRight)
 				textX -= padding;
 			//TODO: alignment issue with odd-size-width center-aligned text
-			//else if (textCast->textAlign == kTextAlignCenter && ((borderSize + padding) % 2 == 1)) 
+			//else if (textCast->textAlign == kTextAlignCenter && ((borderSize + padding) % 2 == 1))
 			//	textX--;
 
 			textY += padding / 2;