diff options
| author | Tobias Gunkel | 2011-12-26 20:58:03 +0100 |
|---|---|---|
| committer | Tobias Gunkel | 2012-02-11 08:02:25 +0100 |
| commit | 05f853edd7e1b80d25678ccd38c23ab3c171adab (patch) | |
| tree | 22804a43ff6ca4a05aba96175bdf87fff9cdccdc /engines | |
| parent | 2acd5a823984eccd341b4528523016f9cd539999 (diff) | |
| download | scummvm-rg350-05f853edd7e1b80d25678ccd38c23ab3c171adab.tar.gz scummvm-rg350-05f853edd7e1b80d25678ccd38c23ab3c171adab.tar.bz2 scummvm-rg350-05f853edd7e1b80d25678ccd38c23ab3c171adab.zip | |
SCUMM: Fix meteor actor index
- Now the correct actor name is shown with "give ... to meteor". Formerly the name was "".
- Add actor names that do not have a string assigned
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/actor.cpp | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp index 4a92d6d81a..70e051edfd 100644 --- a/engines/scumm/actor.cpp +++ b/engines/scumm/actor.cpp @@ -1323,23 +1323,23 @@ static const byte v0ActorSounds[24] = { 0x06, // Bernard 0x06, // Wendy 0x00, // Jeff - 0x46, // ??? + 0x46, // Radiation Suit 0x06, // Dr Fred 0x06, // Nurse Edna 0x06, // Weird Ed 0x06, // Dead Cousin Ted 0xFF, // Purple Tentacle 0xFF, // Green Tentacle - 0x06, // Meteor - 0xC0, // Plant - 0x06, // ??? - 0x06, // ??? - 0x00, // ??? - 0xC0, // ??? - 0xC0, // ??? - 0x00, // ??? - 0x06, // Sandy - 0x06, // ??? + 0x06, // Meteor police + 0xC0, // Meteor + 0x06, // Mark Eteer + 0x06, // Talkshow Host + 0x00, // Plant + 0xC0, // Meteor Radiation + 0xC0, // Edsel (small, outro) + 0x00, // Meteor (small, intro) + 0x06, // Sandy (Lab) + 0x06, // Sandy (Cut-Scene) }; /* Used in Scumm v5 only. Play sounds associated with actors */ @@ -2298,22 +2298,23 @@ static const char *const v0ActorNames_English[25] = { "Bernard", "Wendy", "Jeff", - "", + "", // Radiation Suit "Dr Fred", "Nurse Edna", "Weird Ed", "Dead Cousin Ted", "Purple Tentacle", "Green Tentacle", + "", // Meteor Police "Meteor", - "", - "", - "", + "", // Mark Eteer + "", // Talkshow Host "Plant", - "", - "", - "", - "Sandy" + "", // Meteor Radiation + "", // Edsel (small, outro) + "", // Meteor (small, intro) + "Sandy", // (Lab) + "", // Sandy (Cut-Scene) }; static const char *const v0ActorNames_German[25] = { @@ -2331,15 +2332,16 @@ static const char *const v0ActorNames_German[25] = { "Ted", "Lila Tentakel", "Gr<nes Tentakel", - "Meteor", "", + "Meteor", "", "", "Pflanze", "", "", "", - "Sandy" + "Sandy", + "", }; const byte *Actor::getActorName() { |