diff options
author | Torbjörn Andersson | 2014-02-27 07:39:13 +0100 |
---|---|---|
committer | Torbjörn Andersson | 2014-02-27 07:39:13 +0100 |
commit | d56d64c8ef018cec8ad4bd99b64921c80ebf9727 (patch) | |
tree | 0bdb8d79d9d5e80cf8420ea47649123c8b425d5e /engines/agos | |
parent | f8c3dcd8b8c26c5b86f41a2e2dd279ad432ea0dd (diff) | |
download | scummvm-rg350-d56d64c8ef018cec8ad4bd99b64921c80ebf9727.tar.gz scummvm-rg350-d56d64c8ef018cec8ad4bd99b64921c80ebf9727.tar.bz2 scummvm-rg350-d56d64c8ef018cec8ad4bd99b64921c80ebf9727.zip |
AGOS: Move most off the loyalty rating workaround to off_b2Set()
Kirben pointed out that there were more loyalty rating events tied
to this opcode than to off_loadVideo(). I didn't notice this
myself since the video loading was so much easier to spot in the
script dump. It's a pity there doesn't seem to be any one opcode
that covers all of the cases.
Diffstat (limited to 'engines/agos')
-rw-r--r-- | engines/agos/script_ff.cpp | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/engines/agos/script_ff.cpp b/engines/agos/script_ff.cpp index a9cadb55f3..2ab9847f88 100644 --- a/engines/agos/script_ff.cpp +++ b/engines/agos/script_ff.cpp @@ -490,6 +490,18 @@ void AGOSEngine_Feeble::off_b2Set() { // Confessing: Confirmed Minor Character Flaws setLoyaltyRating(2); break; + case 240: + // Being sent to Cygnus Alpha: Suspected Subversive Activity + setLoyaltyRating(3); + break; + case 251: + // Escaping from Cygnus Alpha: Confirmed Subversive Activity + setLoyaltyRating(4); + break; + case 253: + // Arriving at rebel base: Freedom Fighters Operative + setLoyaltyRating(6); + break; default: break; } @@ -600,18 +612,9 @@ void AGOSEngine_Feeble::off_loadVideo() { // opcodes to set the loyalty rating. This approximates the script // from the 2CD version. See bug #6525. - if (strcmp((const char *)filename, "MainMin.smk") == 0) { - // Being sent to Cygnus Alpha: Suspected Subversive Activity - setLoyaltyRating(3); - } else if (strcmp((const char *)filename, "fxmadsam.smk") == 0) { - // Escaping from Cygnus Alpha: Confirmed Subversive Activity - setLoyaltyRating(4); - } else if (strcmp((const char *)filename, "Statue1.smk") == 0) { + if (strcmp((const char *)filename, "Statue1.smk") == 0) { // Being brought before Filbert: Confirmed Treasonous Activity setLoyaltyRating(5); - } else if (strcmp((const char *)filename, "IceTrench.smk") == 0) { - // Arriving at rebel base: Freedom Fighters Operative - setLoyaltyRating(6); } } } |