diff options
-rw-r--r-- | queen/command.cpp | 23 | ||||
-rw-r--r-- | queen/cutaway.cpp | 4 | ||||
-rw-r--r-- | queen/journal.cpp | 22 |
3 files changed, 12 insertions, 37 deletions
diff --git a/queen/command.cpp b/queen/command.cpp index 7ce4734a9f..e50a7ba851 100644 --- a/queen/command.cpp +++ b/queen/command.cpp @@ -968,24 +968,11 @@ void Command::executeStandardStuff(const Verb& action, int16 subj1, int16 subj2) _logic->joeSpeak(20); } else { - switch(Logic::randomizer.getRandomNumber(3)) { - case 0: - // 'I can't pick that up' - _logic->joeSpeak(5); - break; - case 1: - // 'I don't think I need that' - _logic->joeSpeak(6); - break; - case 2: - // 'I'd rather leave it here' - _logic->joeSpeak(7); - break; - case 3: - // 'I don't think I'd have any use for that' - _logic->joeSpeak(8); - break; - } + // 5 : 'I can't pick that up' + // 6 : 'I don't think I need that' + // 7 : 'I'd rather leave it here' + // 8 : 'I don't think I'd have any use for that' + _logic->joeSpeak(5 + Logic::randomizer.getRandomNumber(3)); } } break; diff --git a/queen/cutaway.cpp b/queen/cutaway.cpp index 3cd211559f..f642747166 100644 --- a/queen/cutaway.cpp +++ b/queen/cutaway.cpp @@ -1115,7 +1115,7 @@ byte *Cutaway::getCutawayAnim(byte *ptr, int header, CutawayAnim &anim) { if (anim.bank != 13) { /* XXX if (OLDBANK != T) */ { //debug(0, "Loading bank '%s'", _bankNames[anim.bank-1]); - _graphics->bankLoad(_bankNames[anim.bank-1], 8); + _graphics->bankLoad(_bankNames[anim.bank-1], CUTAWAY_BANK); // XXX OLDBANK=T; } @@ -1746,7 +1746,7 @@ void Cutaway::stop() { bank = 15; else if (bank != 13) { // XXX if(bank != oldBank) { - _graphics->bankLoad(_bankNames[bank-1], 8); + _graphics->bankLoad(_bankNames[bank-1], CUTAWAY_BANK); // XXX oldBank = bank; // XXX } bank = 8; diff --git a/queen/journal.cpp b/queen/journal.cpp index bdb56c46be..f12b3ecadf 100644 --- a/queen/journal.cpp +++ b/queen/journal.cpp @@ -30,18 +30,6 @@ namespace Queen { -// TODO -// - misc -// * better Journal integration in Logic -// * get rid of g_engine global -// - save/load code related -// * new format (SCVM [ver]32 [flags]32) all BE -// * move code from Resource to Journal -// - Logic::prepareSaveData(uint8 *dstBuf); -// - Logic::parseSaveData(const uint8 *srcBuf); -// - Logic::readSaveDataDescription(char *desc); -// - tmpbamflag -> carbam, final fight - Journal::Journal(Logic *l, Graphics *g, Display *d, Sound *s, GameConfig *c) : _logic(l), _graphics(g), _display(d), _sound(s), _cfg(c) { @@ -530,9 +518,13 @@ void Journal::showInformationBox() { _graphics->textSetCentered(132, "PC CD-ROM", false); break; case 'a': + _graphics->textSetCentered(132, "Amiga A500/600", false); + break; case 'A': + _graphics->textSetCentered(132, "Amiga A1200", false); + break; case 'c': - _graphics->textSetCentered(132, "Amiga", false); + _graphics->textSetCentered(132, "Amiga CD-32", false); break; } switch (ver[1]) { @@ -628,10 +620,6 @@ void Journal::loadState(int slot) { warning("Journal::loadState(%d)", slot); _logic->gameLoad(slot); - // maybe allow loading others formats too : - // - loadState_DOS(); size = 24613, LE - // - loadState_Amiga(); size = 24607, BE - // - loadState_Joost(); size = 24622, BE } |