aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/scumm/actor.cpp21
-rw-r--r--engines/scumm/actor.h2
-rw-r--r--engines/scumm/intern.h3
-rw-r--r--engines/scumm/scumm.cpp2
-rw-r--r--engines/scumm/verbs.cpp75
5 files changed, 87 insertions, 16 deletions
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 013f279369..177e219799 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -1991,8 +1991,25 @@ void Actor::setActorCostume(int c) {
}
}
-byte *Actor::getActorName() {
- byte *ptr = _vm->getResourceAddress(rtActorName, _number);
+static const char* v0ActorNames[7] = {
+ "Syd",
+ "Razor",
+ "Dave",
+ "Michael",
+ "Bernard",
+ "Wendy",
+ "Jeff"
+};
+
+const byte *Actor::getActorName() {
+ const byte *ptr;
+
+ if (_vm->_game.version == 0) {
+ ptr = (const byte *)v0ActorNames[_number - 1];
+ } else {
+ ptr = _vm->getResourceAddress(rtActorName, _number);
+ }
+
if (ptr == NULL) {
debugC(DEBUG_ACTORS, "Failed to find name of actor %d", _number);
}
diff --git a/engines/scumm/actor.h b/engines/scumm/actor.h
index 5dc2f81897..9824146974 100644
--- a/engines/scumm/actor.h
+++ b/engines/scumm/actor.h
@@ -228,7 +228,7 @@ public:
bool actorHitTest(int x, int y);
- byte *getActorName();
+ const byte *getActorName();
void startWalkActor(int x, int y, int dir);
void stopActorMoving();
protected:
diff --git a/engines/scumm/intern.h b/engines/scumm/intern.h
index 8324224b30..1d6f21e6b2 100644
--- a/engines/scumm/intern.h
+++ b/engines/scumm/intern.h
@@ -451,7 +451,8 @@ protected:
virtual void checkExecVerbs();
virtual void handleMouseOver(bool updateInventory);
- void initC64Verbs();
+ void resetVerbs();
+ void setNewKidVerbs();
void drawSentence();
virtual int getVarOrDirectWord(byte mask);
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 275ac09625..ae18bf8673 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1428,7 +1428,7 @@ void ScummEngine::resetScumm() {
void ScummEngine_v0::resetScumm() {
ScummEngine_v2::resetScumm();
- initC64Verbs();
+ resetVerbs();
}
void ScummEngine_v2::resetScumm() {
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index 19c91d1536..404d6b5a71 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -46,7 +46,7 @@ struct VerbSettings {
const char *name;
};
-static const VerbSettings C64VerbTable_English[] = {
+static const VerbSettings v0VerbTable_English[] = {
{ 1, 8, 0, 0, "Open"},
{ 2, 8, 1, 0, "Close"},
{ 3, 0, 2, 4, "Give"},
@@ -65,7 +65,7 @@ static const VerbSettings C64VerbTable_English[] = {
};
// FIXME: Replace * with the correct character
-static const VerbSettings C64VerbTable_German[] = {
+static const VerbSettings v0VerbTable_German[] = {
{ 1, 0, 1, 0, "Ziehe"},
{ 2, 0, 0, 0, "Dr[cke"},
{ 3, 7, 2, 4, "Lese"},
@@ -83,14 +83,18 @@ static const VerbSettings C64VerbTable_German[] = {
{15, 23, 2, 0, "Benutz"}
};
-void ScummEngine_v0::initC64Verbs() {
+// TODO: Move actor names to better location
+void ScummEngine_v0::resetVerbs() {
VirtScreen *virt = &virtscr[kVerbVirtScreen];
VerbSlot *vs;
int i;
+ for (i = 1; i < 16; i++)
+ killVerb(i);
+
for (i = 1; i < 16; i++) {
vs = &_verbs[i];
- vs->verbid = C64VerbTable_English[i - 1].id;
+ vs->verbid = v0VerbTable_English[i - 1].id;
vs->color = 5;
vs->hicolor = 7;
vs->dimcolor = 11;
@@ -101,20 +105,51 @@ void ScummEngine_v0::initC64Verbs() {
vs->key = 0;
vs->center = 0;
vs->imgindex = 0;
- vs->prep = C64VerbTable_English[i - 1].prep;
+ vs->prep = v0VerbTable_English[i - 1].prep;
if (_language == Common::DE_DEU) {
- vs->curRect.left = C64VerbTable_German[i - 1].x_pos * 8;
- vs->curRect.top = C64VerbTable_German[i - 1].y_pos * 8 + virt->topline + 8;
- loadPtrToResource(rtVerb, i, (const byte*)C64VerbTable_German[i - 1].name);
+ vs->curRect.left = v0VerbTable_German[i - 1].x_pos * 8;
+ vs->curRect.top = v0VerbTable_German[i - 1].y_pos * 8 + virt->topline + 8;
+ loadPtrToResource(rtVerb, i, (const byte*)v0VerbTable_German[i - 1].name);
} else {
- vs->curRect.left = C64VerbTable_English[i - 1].x_pos * 8;
- vs->curRect.top = C64VerbTable_English[i - 1].y_pos * 8 + virt->topline + 8;
- loadPtrToResource(rtVerb, i, (const byte*)C64VerbTable_English[i - 1].name);
+ vs->curRect.left = v0VerbTable_English[i - 1].x_pos * 8;
+ vs->curRect.top = v0VerbTable_English[i - 1].y_pos * 8 + virt->topline + 8;
+ loadPtrToResource(rtVerb, i, (const byte*)v0VerbTable_English[i - 1].name);
}
}
}
+void ScummEngine_v0::setNewKidVerbs() {
+ VirtScreen *virt = &virtscr[kVerbVirtScreen];
+ VerbSlot *vs;
+ int i;
+
+ for (i = 1; i < 16; i++)
+ killVerb(i);
+
+ for (i = 1; i < 4; i++) {
+ vs = &_verbs[i];
+ vs->verbid = i;
+ vs->color = 5;
+ vs->hicolor = 7;
+ vs->dimcolor = 11;
+ vs->type = kTextVerbType;
+ vs->charset_nr = _string[0]._default.charset;
+ vs->curmode = 1;
+ vs->saveid = 0;
+ vs->key = 0;
+ vs->center = 0;
+ vs->imgindex = 0;
+ vs->prep = 0;
+ vs->curRect.left = (i * 8) * 8;
+ vs->curRect.top = virt->topline + 8;
+
+ Actor *a = derefActor(VAR(96 + i), "setNewKidVerbs");
+ loadPtrToResource(rtVerb, i, (const byte*)(const byte*)a->getActorName());
+ }
+ setUserState(191);
+}
+
void ScummEngine_v2::initV2MouseOver() {
int i;
int arrow_color, color, hi_color;
@@ -578,14 +613,32 @@ void ScummEngine_v0::checkExecVerbs() {
checkV2Inventory(_mouse.x, _mouse.y);
} else {
int over = findVerbAtPos(_mouse.x, _mouse.y);
+
+ // Handle New Kid verb options
+ if (_activeVerb == 7) {
+ if (over) {
+ _activeVerb = 13;
+ VAR(VAR_EGO) = VAR(96 + _verbs[over].verbid);
+ actorFollowCamera(VAR(VAR_EGO));
+ resetVerbs();
+ setUserState(247);
+ }
+ return;
+ }
+
if (over) {
_activeVerb = _verbs[over].verbid;
+ // Selected New Kid verb
+ if (_activeVerb == 7)
+ setNewKidVerbs();
+
return;
}
int act = getActorFromPos(_virtualMouse.x, _virtualMouse.y);
int obj = findObject(_virtualMouse.x, _virtualMouse.y);
if (act != 0 && _activeVerb == 3 && _activeInventory != 0) {
+ // Give inventory item to actor
VAR(5) = act;
runObject(_activeInventory, _activeVerb);
} else if (obj) {
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-29 18:50:06 +0000