[Scummvm-git-logs] scummvm master -> 48f9ccae0b073f3faf2e0e44f2901359248824c7
sev-
sev at scummvm.org
Fri Jul 10 19:26:22 UTC 2020
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
d6fe6d3edc DIRECTOR: LINGO: Added rest of 'the' getter stubs
a95e3bf71e DIRECTOR: LINGO: Added stubs for setter of 'the' entities
48f9ccae0b DIRECTOR: LINGO: Added stubs to getter/setters of 'the sprite'
Commit: d6fe6d3edc8cfefd8c692b1d84bcf4e8a012eac9
https://github.com/scummvm/scummvm/commit/d6fe6d3edc8cfefd8c692b1d84bcf4e8a012eac9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-10T21:26:00+02:00
Commit Message:
DIRECTOR: LINGO: Added rest of 'the' getter stubs
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 4071e90142..a426809ddc 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -109,10 +109,10 @@ TheEntity entities[] = {
{ kTheParamCount, "paramCount", false, 4 }, // D4 f
{ kThePathName, "pathName", false, 2 }, // D2 f
{ kThePauseState, "pauseState", false, 2 }, // D2 f
- { kThePi, "pi", false, 4 }, // D4 f
{ kThePerFrameHook, "perFrameHook", false, 2 }, // D2 p
{ kThePreloadEventAbort,"preloadEventAbort",false, 4 }, // D4 p
{ kThePreLoadRAM, "preLoadRAM", false, 4 }, // D4 p
+ { kThePi, "pi", false, 4 }, // D4 f
{ kTheQuickTimePresent, "quickTimePresent", false, 3 }, // D3.1 f
{ kTheRandomSeed, "randomSeed", false, 4 }, // D4 p
{ kTheResult, "result", false, 2 }, // D2 f
@@ -138,13 +138,13 @@ TheEntity entities[] = {
{ kTheStillDown, "stillDown", false, 2 }, // D2 f
{ kTheSwitchColorDepth, "switchColorDepth", false, 2 }, // D2 p
{ kTheTicks, "ticks", false, 2 }, // D2 f
+ { kTheTime, "time", false, 3 }, // D3 f
{ kTheTimeoutKeyDown, "timeoutKeyDown", false, 2 }, // D2 p
{ kTheTimeoutLapsed, "timeoutLapsed", false, 2 }, // D2 p
{ kTheTimeoutLength, "timeoutLength", false, 2 }, // D2 p
{ kTheTimeoutMouse, "timeoutMouse", false, 2 }, // D2 p
{ kTheTimeoutPlay, "timeoutPlay", false, 2 }, // D2 p
{ kTheTimeoutScript, "timeoutScript", false, 2 }, // D2 p
- { kTheTime, "time", false, 3 }, // D3 f
{ kTheTimer, "timer", false, 2 }, // D2 p
{ kTheTrace, "trace", false, 4 }, // D4 p
{ kTheTraceLoad, "traceLoad", false, 4 }, // D4 p
@@ -533,15 +533,20 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
d.type = INT;
d.u.i = _vm->_machineType;
break;
- case kTheMovie:
- case kTheMovieName:
- d.type = STRING;
- d.u.s = new Common::String(_vm->getCurrentMovie()->getMacName());
+ case kTheMaxInteger:
+ getTheEntitySTUB(kTheMaxInteger);
break;
- case kTheMoviePath:
- case kThePathName:
- d.type = STRING;
- d.u.s = new Common::String(_vm->getCurrentPath());
+ case kTheMemorySize:
+ getTheEntitySTUB(kTheMemorySize);
+ break;
+ case kTheMenu:
+ getTheEntitySTUB(kTheMenu);
+ break;
+ case kTheMenuItem:
+ getTheEntitySTUB(kTheMenuItem);
+ break;
+ case kTheMenuItems:
+ getTheEntitySTUB(kTheMenuItems);
break;
case kTheMouseCast:
{
@@ -554,6 +559,9 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
d.u.i = -1;
}
break;
+ case kTheMouseChar:
+ getTheEntitySTUB(kTheMouseChar);
+ break;
case kTheMouseDown:
d.type = INT;
d.u.i = g_system->getEventManager()->getButtonState() & (1 << Common::MOUSE_BUTTON_LEFT | 1 << Common::MOUSE_BUTTON_RIGHT) ? 1 : 0;
@@ -569,9 +577,11 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
d.type = INT;
d.u.i = g_director->getCurrentStage()->getMousePos().x;
break;
- case kTheMouseV:
- d.type = INT;
- d.u.i = g_director->getCurrentStage()->getMousePos().y;
+ case kTheMouseItem:
+ getTheEntitySTUB(kTheMouseItem);
+ break;
+ case kTheMouseLine:
+ getTheEntitySTUB(kTheMouseLine);
break;
case kTheMouseUp:
d.type = INT;
@@ -584,14 +594,49 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
else
d.u.s = new Common::String();
break;
+ case kTheMouseV:
+ d.type = INT;
+ d.u.i = g_director->getCurrentStage()->getMousePos().y;
+ break;
+ case kTheMouseWord:
+ getTheEntitySTUB(kTheMouseWord);
+ break;
+ case kTheMovie:
+ case kTheMovieName:
+ d.type = STRING;
+ d.u.s = new Common::String(_vm->getCurrentMovie()->getMacName());
+ break;
+ case kTheMovieFileFreeSize:
+ getTheEntitySTUB(kTheMovieFileFreeSize);
+ break;
+ case kTheMovieFileSize:
+ getTheEntitySTUB(kTheMovieFileSize);
+ break;
+ case kTheMoviePath:
+ case kThePathName:
+ d.type = STRING;
+ d.u.s = new Common::String(_vm->getCurrentPath());
+ break;
case kTheMultiSound:
// We always support multiple sound channels!
d.type = INT;
d.u.i = 1;
break;
+ case kTheOptionDown:
+ getTheEntitySTUB(kTheOptionDown);
+ break;
+ case kThePauseState:
+ getTheEntitySTUB(kThePauseState);
+ break;
case kThePerFrameHook:
d = _perFrameHook;
break;
+ case kThePreloadEventAbort:
+ getTheEntitySTUB(kThePreloadEventAbort);
+ break;
+ case kThePreLoadRAM:
+ getTheEntitySTUB(kThePreLoadRAM);
+ break;
case kThePi:
d.type = FLOAT;
d.u.f = M_PI;
@@ -601,6 +646,45 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
d.type = INT;
d.u.i = 1;
break;
+ case kTheRandomSeed:
+ getTheEntitySTUB(kTheRandomSeed);
+ break;
+ case kTheResult:
+ getTheEntitySTUB(kTheResult);
+ break;
+ case kTheRightMouseDown:
+ getTheEntitySTUB(kTheRightMouseDown);
+ break;
+ case kTheRightMouseUp:
+ getTheEntitySTUB(kTheRightMouseUp);
+ break;
+ case kTheRomanLingo:
+ getTheEntitySTUB(kTheRomanLingo);
+ break;
+ case kTheSearchCurrentFolder:
+ getTheEntitySTUB(kTheSearchCurrentFolder);
+ break;
+ case kTheSearchPath:
+ getTheEntitySTUB(kTheSearchPath);
+ break;
+ case kTheSelection:
+ getTheEntitySTUB(kTheSelection);
+ break;
+ case kTheSelEnd:
+ getTheEntitySTUB(kTheSelEnd);
+ break;
+ case kTheSelStart:
+ getTheEntitySTUB(kTheSelStart);
+ break;
+ case kTheShiftDown:
+ getTheEntitySTUB(kTheShiftDown);
+ break;
+ case kTheSoundEnabled:
+ getTheEntitySTUB(kTheSoundEnabled);
+ break;
+ case kTheSoundLevel:
+ getTheEntitySTUB(kTheSoundLevel);
+ break;
case kTheSoundEntity:
{
switch (field) {
@@ -629,6 +713,9 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
d.type = INT;
d.u.i = _vm->getCurrentMovie()->_movieRect.bottom;
break;
+ case kTheStageColor:
+ getTheEntitySTUB(kTheStageColor);
+ break;
case kTheStageLeft:
d.type = INT;
d.u.i = _vm->getCurrentMovie()->_movieRect.left;
@@ -645,9 +732,30 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
d.type = INT;
d.u.i = _vm->_wm->_mouseDown;
break;
+ case kTheSwitchColorDepth:
+ getTheEntitySTUB(kTheSwitchColorDepth);
+ break;
+ case kTheTicks:
+ getTheEntitySTUB(kTheTicks);
+ break;
case kTheTime:
d = getTheTime(field);
break;
+ case kTheTimeoutKeyDown:
+ getTheEntitySTUB(kTheTimeoutKeyDown);
+ break;
+ case kTheTimeoutLapsed:
+ getTheEntitySTUB(kTheTimeoutLapsed);
+ break;
+ case kTheTimeoutLength:
+ getTheEntitySTUB(kTheTimeoutLength);
+ break;
+ case kTheTimeoutMouse:
+ getTheEntitySTUB(kTheTimeoutMouse);
+ break;
+ case kTheTimeoutPlay:
+ getTheEntitySTUB(kTheTimeoutPlay);
+ break;
case kTheTimeoutScript:
d.type = STRING;
if (mainArchive->primaryEventHandlers.contains(kEventTimeout))
@@ -659,6 +767,18 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
d.type = INT;
d.u.i = _vm->getMacTicks() - _vm->getCurrentMovie()->_lastTimerReset;
break;
+ case kTheTrace:
+ getTheEntitySTUB(kTheTrace);
+ break;
+ case kTheTraceLoad:
+ getTheEntitySTUB(kTheTraceLoad);
+ break;
+ case kTheTraceLogFile:
+ getTheEntitySTUB(kTheTraceLogFile);
+ break;
+ case kTheUpdateMovieEnabled:
+ getTheEntitySTUB(kTheUpdateMovieEnabled);
+ break;
case kTheWindow:
g_lingo->push(id);
LB::b_window(1);
Commit: a95e3bf71eddd6f7634b57cbb26c23a362c9d530
https://github.com/scummvm/scummvm/commit/a95e3bf71eddd6f7634b57cbb26c23a362c9d530
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-10T21:26:00+02:00
Commit Message:
DIRECTOR: LINGO: Added stubs for setter of 'the' entities
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 a426809ddc..271360adb2 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -56,7 +56,7 @@ TheEntity entities[] = {
{ kTheColorQD, "colorQD", false, 2 }, // D2 f
{ kTheCommandDown, "commandDown", false, 2 }, // D2 f
{ kTheControlDown, "controlDown", false, 2 }, // D2 f
- { kTheDate, "date", false, 3 }, // D3
+ { kTheDate, "date", false, 3 }, // D3 f
{ kTheDoubleClick, "doubleClick", false, 2 }, // D2 f
{ kTheExitLock, "exitLock", false, 2 }, // D2 p
{ kTheField, "field", true, 3 }, // D3
@@ -126,8 +126,8 @@ TheEntity entities[] = {
{ kTheSelStart, "selStart", false, 2 }, // D2 p
{ kTheShiftDown, "shiftDown", false, 2 }, // D2 f
{ kTheSoundEnabled, "soundEnabled", false, 2 }, // D2 p
- { kTheSoundLevel, "soundLevel", false, 2 }, // D2 p
{ kTheSoundEntity, "sound", true, 4 }, // D4
+ { kTheSoundLevel, "soundLevel", false, 2 }, // D2 p
{ kTheSprite, "sprite", true, 2 }, // D4 p
{ kTheStage, "stage", false, 4 }, // D4 p
{ kTheStageBottom, "stageBottom", false, 2 }, // D2 f
@@ -334,7 +334,6 @@ const char *Lingo::field2str(int id) {
#define getTheEntitySTUB(entity) \
warning("Lingo::getTheEntity(): Unprocessed getting entity %s", 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));
@@ -365,7 +364,7 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
d = getTheCast(id, field);
break;
case kTheCastMembers:
- getTheEntitySTUB(kTheCastMembers);
+ warning("Lingo::getTheEntity(): Unprocessed getting field %s of entity %s", field2str(field), entity2str(entity));
break;
case kTheCenterStage:
getTheEntitySTUB(kTheCenterStage);
@@ -682,9 +681,6 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
case kTheSoundEnabled:
getTheEntitySTUB(kTheSoundEnabled);
break;
- case kTheSoundLevel:
- getTheEntitySTUB(kTheSoundLevel);
- break;
case kTheSoundEntity:
{
switch (field) {
@@ -703,6 +699,9 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
}
}
break;
+ case kTheSoundLevel:
+ getTheEntitySTUB(kTheSoundLevel);
+ break;
case kTheSprite:
d = getTheSprite(id, field);
break;
@@ -795,12 +794,21 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
return d;
}
+#define setTheEntitySTUB(entity) \
+ warning("Lingo::setTheEntity(): Unprocessed setting entity %s", entity2str(entity));
+
void Lingo::setTheEntity(int entity, Datum &id, int field, Datum &d) {
if (debugChannelSet(3, kDebugLingoExec)) {
debugC(3, kDebugLingoExec, "Lingo::setTheEntity(%s, %s, %s, %s)", entity2str(entity), id.asString(true).c_str(), field2str(field), d.asString(true).c_str());
}
switch (entity) {
+ case kTheActorList:
+ setTheEntitySTUB(kTheActorList);
+ break;
+ case kTheBeepOn:
+ setTheEntitySTUB(kTheBeepOn);
+ break;
case kTheButtonStyle:
if (d.asInt())
g_director->_wm->_mode = Director::wmMode | Graphics::kWMModeButtonDialogStyle;
@@ -810,12 +818,27 @@ void Lingo::setTheEntity(int entity, Datum &id, int field, Datum &d) {
case kTheCast:
setTheCast(id, field, d);
break;
+ case kTheCenterStage:
+ setTheEntitySTUB(kTheCenterStage);
+ break;
+ case kTheCheckBoxAccess:
+ setTheEntitySTUB(kTheCheckBoxAccess);
+ break;
+ case kTheCheckBoxType:
+ setTheEntitySTUB(kTheCheckBoxType);
+ break;
case kTheColorDepth:
_vm->_colorDepth = d.asInt();
// bpp. 1, 2, 4, 8, 32
warning("STUB: Lingo::setTheEntity(): Set color depth to %d", _vm->_colorDepth);
break;
+ case kTheExitLock:
+ setTheEntitySTUB(kTheExitLock);
+ break;
+ case kTheFixStageSize:
+ setTheEntitySTUB(kTheFixStageSize);
+ break;
case kTheField:
setTheField(id, field, d);
break;
@@ -824,12 +847,36 @@ void Lingo::setTheEntity(int entity, Datum &id, int field, Datum &d) {
_floatPrecision = MAX(0, MIN(_floatPrecision, 19)); // 0 to 19
_floatPrecisionFormat = Common::String::format("%%.%df", _floatPrecision);
break;
+ case kTheFrameLabel:
+ setTheEntitySTUB(kTheFrameLabel);
+ break;
+ case kTheFrameScript:
+ setTheEntitySTUB(kTheFrameScript);
+ break;
+ case kTheFramePalette:
+ setTheEntitySTUB(kTheFramePalette);
+ break;
+ case kTheFullColorPermit:
+ setTheEntitySTUB(kTheFullColorPermit);
+ break;
+ case kTheImageDirect:
+ setTheEntitySTUB(kTheImageDirect);
+ break;
+ case kTheItemDelimiter:
+ setTheEntitySTUB(kTheItemDelimiter);
+ break;
case kTheKeyDownScript:
setPrimaryEventHandler(kEventKeyDown, d.asString());
break;
case kTheKeyUpScript:
setPrimaryEventHandler(kEventKeyUp, d.asString());
break;
+ case kTheMenu:
+ setTheEntitySTUB(kTheMenu);
+ break;
+ case kTheMenuItem:
+ setTheEntitySTUB(kTheMenuItem);
+ break;
case kTheMouseDownScript:
setPrimaryEventHandler(kEventMouseDown, d.asString());
break;
@@ -839,6 +886,27 @@ void Lingo::setTheEntity(int entity, Datum &id, int field, Datum &d) {
case kThePerFrameHook:
_perFrameHook = d;
break;
+ case kThePreloadEventAbort:
+ setTheEntitySTUB(kThePreloadEventAbort);
+ break;
+ case kThePreLoadRAM:
+ setTheEntitySTUB(kThePreLoadRAM);
+ break;
+ case kTheRandomSeed:
+ setTheEntitySTUB(kTheRandomSeed);
+ break;
+ case kTheRomanLingo:
+ setTheEntitySTUB(kTheRomanLingo);
+ break;
+ case kTheSelEnd:
+ setTheEntitySTUB(kTheSelEnd);
+ break;
+ case kTheSelStart:
+ setTheEntitySTUB(kTheSelStart);
+ break;
+ case kTheSoundEnabled:
+ setTheEntitySTUB(kTheSoundEnabled);
+ break;
case kTheSoundEntity:
{
switch (field) {
@@ -856,15 +924,54 @@ void Lingo::setTheEntity(int entity, Datum &id, int field, Datum &d) {
}
}
break;
- case kTheStageColor:
- g_director->getCurrentStage()->setStageColor(d.asInt());
+ case kTheSoundLevel:
+ setTheEntitySTUB(kTheSoundLevel);
break;
case kTheSprite:
setTheSprite(id, field, d);
break;
+ case kTheStage:
+ setTheEntitySTUB(kTheStage);
+ break;
+ case kTheStageColor:
+ g_director->getCurrentStage()->setStageColor(d.asInt());
+ break;
+ case kTheSwitchColorDepth:
+ setTheEntitySTUB(kTheSwitchColorDepth);
+ break;
+ case kTheTimeoutKeyDown:
+ setTheEntitySTUB(kTheTimeoutKeyDown);
+ break;
+ case kTheTimeoutLapsed:
+ setTheEntitySTUB(kTheTimeoutLapsed);
+ break;
+ case kTheTimeoutLength:
+ setTheEntitySTUB(kTheTimeoutLength);
+ break;
+ case kTheTimeoutMouse:
+ setTheEntitySTUB(kTheTimeoutMouse);
+ break;
+ case kTheTimeoutPlay:
+ setTheEntitySTUB(kTheTimeoutPlay);
+ break;
case kTheTimeoutScript:
setPrimaryEventHandler(kEventTimeout, d.asString());
break;
+ case kTheTimer:
+ setTheEntitySTUB(kTheTimer);
+ break;
+ case kTheTrace:
+ setTheEntitySTUB(kTheTrace);
+ break;
+ case kTheTraceLoad:
+ setTheEntitySTUB(kTheTraceLoad);
+ break;
+ case kTheTraceLogFile:
+ setTheEntitySTUB(kTheTraceLogFile);
+ break;
+ case kTheUpdateMovieEnabled:
+ setTheEntitySTUB(kTheUpdateMovieEnabled);
+ break;
case kTheWindow:
g_lingo->push(id);
LB::b_window(1);
Commit: 48f9ccae0b073f3faf2e0e44f2901359248824c7
https://github.com/scummvm/scummvm/commit/48f9ccae0b073f3faf2e0e44f2901359248824c7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-10T21:26:00+02:00
Commit Message:
DIRECTOR: LINGO: Added stubs to getter/setters of 'the sprite'
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 271360adb2..0a0746eff2 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -364,7 +364,7 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
d = getTheCast(id, field);
break;
case kTheCastMembers:
- warning("Lingo::getTheEntity(): Unprocessed getting field %s of entity %s", field2str(field), entity2str(entity));
+ warning("STUB: Lingo::getTheEntity(): Unprocessed getting field %s of entity %s", field2str(field), entity2str(entity));
break;
case kTheCenterStage:
getTheEntitySTUB(kTheCenterStage);
@@ -1044,6 +1044,9 @@ Datum Lingo::getTheSprite(Datum &id1, int field) {
case kTheConstraint:
d.u.i = channel->_constraint;
break;
+ case kTheCursor:
+ warning("STUB: Lingo::getTheSprite(): Unprocessed getting field \"%s\" of sprite", field2str(field));
+ break;
case kTheEditableText:
d.u.i = sprite->_cast ? sprite->_cast->isEditable() : 0;
break;
@@ -1065,6 +1068,9 @@ Datum Lingo::getTheSprite(Datum &id1, int field) {
case kTheLineSize:
d.u.i = sprite->_thickness & 0x3;
break;
+ case kTheLoc:
+ warning("STUB: Lingo::getTheSprite(): Unprocessed getting field \"%s\" of sprite", field2str(field));
+ break;
case kTheLocH:
d.u.i = channel->_currentPoint.x;
break;
@@ -1086,9 +1092,18 @@ Datum Lingo::getTheSprite(Datum &id1, int field) {
case kThePuppet:
d.u.i = sprite->_puppet;
break;
+ case kTheRect:
+ warning("STUB: Lingo::getTheSprite(): Unprocessed getting field \"%s\" of sprite", field2str(field));
+ break;
case kTheRight:
d.u.i = channel->getBbox().right;
break;
+ case kTheScoreColor:
+ warning("STUB: Lingo::getTheSprite(): Unprocessed getting field \"%s\" of sprite", field2str(field));
+ break;
+ case kTheScriptNum:
+ warning("STUB: Lingo::getTheSprite(): Unprocessed getting field \"%s\" of sprite", field2str(field));
+ break;
case kTheStartTime:
d.u.i = sprite->_startTime;
break;
@@ -1176,6 +1191,9 @@ void Lingo::setTheSprite(Datum &id1, int field, Datum &d) {
channel->_constraint = d.u.i;
break;
+ case kTheCursor:
+ warning("STUB: Lingo::setTheSprite(): Unprocessed setting field \"%s\" of sprite", field2str(field));
+ break;
case kTheEditableText:
sprite->_cast ? sprite->_cast->setEditable(d.asInt()) : false;
break;
@@ -1195,6 +1213,9 @@ void Lingo::setTheSprite(Datum &id1, int field, Datum &d) {
case kTheLineSize:
sprite->_thickness = d.asInt();
break;
+ case kTheLoc:
+ warning("STUB: Lingo::setTheSprite(): Unprocessed setting field \"%s\" of sprite", field2str(field));
+ break;
case kTheLocH:
if (!sprite->_moveable) {
// WORKAROUND: Chop Suey moon cursor is marked neither puppet nor moveable
More information about the Scummvm-git-logs
mailing list