[Scummvm-cvs-logs] CVS: scummvm/queen cutaway.cpp,1.84,1.85 command.cpp,1.33,1.34 journal.cpp,1.6,1.7

[Gregory Montoir]

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv1271

Modified Files:
	cutaway.cpp command.cpp journal.cpp 
Log Message:
minor cleanup, reuse some data from intervie.exe

Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- cutaway.cpp	5 Dec 2003 20:16:32 -0000	1.84
+++ cutaway.cpp	6 Dec 2003 13:13:12 -0000	1.85
@@ -1115,7 +1115,7 @@
 		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 @@
 						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;

Index: command.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/command.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- command.cpp	3 Dec 2003 10:33:14 -0000	1.33
+++ command.cpp	6 Dec 2003 13:13:13 -0000	1.34
@@ -968,24 +968,11 @@
 				_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;

Index: journal.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/journal.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- journal.cpp	1 Dec 2003 20:48:40 -0000	1.6
+++ journal.cpp	6 Dec 2003 13:13:13 -0000	1.7
@@ -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 @@
 		_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 @@
 
 	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
 }