[Scummvm-git-logs] scummvm master -> 24e6c820a7f7b6ed01317c2b554eb635e2d69415

[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:
7aebe197a1 DIRECTOR: LINGO: Added stubs for some of 'the' getters
24e6c820a7 DIRECTOR: More stubs for 'the' getters


Commit: 7aebe197a176982ae9b0a059d4bbc47e5edf0d9d
    https://github.com/scummvm/scummvm/commit/7aebe197a176982ae9b0a059d4bbc47e5edf0d9d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-10T13:33:28+02:00

Commit Message:
DIRECTOR: LINGO: Added stubs for some of 'the' getters

Changed paths:
    engines/director/lingo/lingo-the.cpp


diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index 67d79c7153..5c698a26e8 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -331,6 +331,10 @@ const char *Lingo::field2str(int id) {
 	return (const char *)buf;
 }
 
+#define getTheEntitySTUB(entity, field) \
+	warning("Lingo::getTheEntity(): Unprocessed getting field \"%s\" of entity %s", field2str(field), entity2str(entity));
+
+
 Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
 	if (debugChannelSet(3, kDebugLingoExec)) {
 		debugC(3, kDebugLingoExec, "Lingo::getTheEntity(%s, %s, %s)", entity2str(entity), id.asString(true).c_str(), field2str(field));
@@ -348,6 +352,15 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
 	LingoArchive *mainArchive = _vm->getCurrentMovie()->getMainLingoArch();
 
 	switch (entity) {
+	case kTheActorList:
+		getTheEntitySTUB(kTheActorList, 0);
+		break;
+	case kTheBeepOn:
+		getTheEntitySTUB(kTheBeepOn, 0);
+		break;
+	case kTheButtonStyle:
+		getTheEntitySTUB(kTheButtonStyle, 0);
+		break;
 	case kTheCast:
 		d = getTheCast(id, field);
 		break;
@@ -575,6 +588,13 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
 	case kTheTime:
 		d = getTheTime(field);
 		break;
+	case kTheTimeoutScript:
+		d.type = STRING;
+		if (mainArchive->primaryEventHandlers.contains(kEventTimeout))
+			d.u.s = new Common::String(mainArchive->primaryEventHandlers[kEventTimeout]);
+		else
+			d.u.s = new Common::String();
+		break;
 	case kTheTimer:
 		d.type = INT;
 		d.u.i = _vm->getMacTicks() - _vm->getCurrentMovie()->_lastTimerReset;
@@ -587,13 +607,6 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
 	case kTheWindowList:
 		d = g_lingo->_windowList;
 		break;
-	case kTheTimeoutScript:
-		d.type = STRING;
-		if (mainArchive->primaryEventHandlers.contains(kEventTimeout))
-			d.u.s = new Common::String(mainArchive->primaryEventHandlers[kEventTimeout]);
-		else
-			d.u.s = new Common::String();
-		break;
 	default:
 		warning("Lingo::getTheEntity(): Unprocessed getting field \"%s\" of entity %s", field2str(field), entity2str(entity));
 		break;


Commit: 24e6c820a7f7b6ed01317c2b554eb635e2d69415
    https://github.com/scummvm/scummvm/commit/24e6c820a7f7b6ed01317c2b554eb635e2d69415
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-10T13:44:36+02:00

Commit Message:
DIRECTOR: More stubs for 'the' getters

Changed paths:
    engines/director/lingo/lingo-the.cpp


diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index 5c698a26e8..4071e90142 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -331,8 +331,8 @@ const char *Lingo::field2str(int id) {
 	return (const char *)buf;
 }
 
-#define getTheEntitySTUB(entity, field) \
-	warning("Lingo::getTheEntity(): Unprocessed getting field \"%s\" of entity %s", field2str(field), entity2str(entity));
+#define getTheEntitySTUB(entity) \
+	warning("Lingo::getTheEntity(): Unprocessed getting entity %s", entity2str(entity));
 
 
 Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
@@ -353,17 +353,32 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
 
 	switch (entity) {
 	case kTheActorList:
-		getTheEntitySTUB(kTheActorList, 0);
+		getTheEntitySTUB(kTheActorList);
 		break;
 	case kTheBeepOn:
-		getTheEntitySTUB(kTheBeepOn, 0);
+		getTheEntitySTUB(kTheBeepOn);
 		break;
 	case kTheButtonStyle:
-		getTheEntitySTUB(kTheButtonStyle, 0);
+		getTheEntitySTUB(kTheButtonStyle);
 		break;
 	case kTheCast:
 		d = getTheCast(id, field);
 		break;
+	case kTheCastMembers:
+		getTheEntitySTUB(kTheCastMembers);
+		break;
+	case kTheCenterStage:
+		getTheEntitySTUB(kTheCenterStage);
+		break;
+	case kTheCheckBoxAccess:
+		getTheEntitySTUB(kTheCheckBoxAccess);
+		break;
+	case kTheCheckBoxType:
+		getTheEntitySTUB(kTheCheckBoxType);
+		break;
+	case kTheClickLoc:
+		getTheEntitySTUB(kTheClickLoc);
+		break;
 	case kTheClickOn:
 		d.type = INT;
 		d.u.i = _vm->getCurrentMovie()->_currentClickOnSpriteId;
@@ -377,9 +392,24 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
 		d.type = INT;
 		d.u.i = 1;
 		break;
+	case kTheCommandDown:
+		getTheEntitySTUB(kTheCommandDown);
+		break;
+	case kTheControlDown:
+		getTheEntitySTUB(kTheControlDown);
+		break;
 	case kTheDate:
 		d = getTheDate(field);
 		break;
+	case kTheDoubleClick:
+		getTheEntitySTUB(kTheDoubleClick);
+		break;
+	case kTheExitLock:
+		getTheEntitySTUB(kTheExitLock);
+		break;
+	case kTheFixStageSize:
+		getTheEntitySTUB(kTheFixStageSize);
+		break;
 	case kTheFloatPrecision:
 		d.type = INT;
 		d.u.i = _floatPrecision;
@@ -388,6 +418,33 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
 		d.type = INT;
 		d.u.i = _vm->getCurrentMovie()->getScore()->getCurrentFrame();
 		break;
+	case kTheFrameLabel:
+		getTheEntitySTUB(kTheFrameLabel);
+		break;
+	case kTheFrameScript:
+		getTheEntitySTUB(kTheFrameScript);
+		break;
+	case kTheFramePalette:
+		getTheEntitySTUB(kTheFramePalette);
+		break;
+	case kTheFrameTempo:
+		getTheEntitySTUB(kTheFrameTempo);
+		break;
+	case kTheFreeBlock:
+		getTheEntitySTUB(kTheFreeBlock);
+		break;
+	case kTheFreeBytes:
+		getTheEntitySTUB(kTheFreeBytes);
+		break;
+	case kTheFullColorPermit:
+		getTheEntitySTUB(kTheFullColorPermit);
+		break;
+	case kTheImageDirect:
+		getTheEntitySTUB(kTheImageDirect);
+		break;
+	case kTheItemDelimiter:
+		getTheEntitySTUB(kTheItemDelimiter);
+		break;
 	case kTheKey:
 		d.type = STRING;
 		d.u.s = new Common::String(_vm->_key);
@@ -410,6 +467,9 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
 		else
 			d.u.s = new Common::String();
 		break;
+	case kTheLabelList:
+		getTheEntitySTUB(kTheLabelList);
+		break;
 	case kTheLastClick:
 		d.type = INT;
 		d.u.i = _vm->getMacTicks() - _vm->getCurrentMovie()->_lastClickTime;