[Scummvm-cvs-logs] SF.net SVN: scummvm: [28095] scummvm/trunk/engines/agi
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Sun Jul 15 08:24:40 CEST 2007
Revision: 28095
http://scummvm.svn.sourceforge.net/scummvm/?rev=28095&view=rev
Author: thebluegr
Date: 2007-07-14 23:24:39 -0700 (Sat, 14 Jul 2007)
Log Message:
-----------
Enabled menus in some old AGI games (released in 1986) which did not have menus them originally: KQ1 Amiga and ST and early versions of KQ3 Amiga, SQ1 ST, SQ1 DOS and SQ1 Amiga. The GF_FORCEMENUS flag has been remaned to GF_MENUS. Also, two problematic versions of KQ3, a problematic version of SQ1 and a problematic version of Mixed up Mother Goose have been disabled. Finally, a duplicate detection entry for SQ1 has been removed
Modified Paths:
--------------
scummvm/trunk/engines/agi/agi.h
scummvm/trunk/engines/agi/detection.cpp
scummvm/trunk/engines/agi/keyboard.cpp
scummvm/trunk/engines/agi/menu.cpp
Modified: scummvm/trunk/engines/agi/agi.h
===================================================================
--- scummvm/trunk/engines/agi/agi.h 2007-07-15 05:18:41 UTC (rev 28094)
+++ scummvm/trunk/engines/agi/agi.h 2007-07-15 06:24:39 UTC (rev 28095)
@@ -112,7 +112,7 @@
GF_AGIPAL = (1 << 4),
GF_MACGOLDRUSH = (1 << 5),
GF_FANMADE = (1 << 6),
- GF_FORCEMENUS = (1 << 7)
+ GF_MENUS = (1 << 7)
};
enum AgiGameID {
Modified: scummvm/trunk/engines/agi/detection.cpp
===================================================================
--- scummvm/trunk/engines/agi/detection.cpp 2007-07-15 05:18:41 UTC (rev 28094)
+++ scummvm/trunk/engines/agi/detection.cpp 2007-07-15 06:24:39 UTC (rev 28095)
@@ -245,6 +245,7 @@
{
// Black Cauldron (Apple IIgs) 1.0O 2/24/89 (CE)
+ // Menus not tested
{
"bc",
"1.0O 1989-02-24 (CE)",
@@ -298,6 +299,7 @@
#if 0
{
// Donald Duck's Playground (Amiga) 1.0C
+ // Menus not tested
{
"ddp",
"1.0C 1987-04-27",
@@ -315,6 +317,7 @@
{
// Donald Duck's Playground (ST) 1.0A 8/8/86
+ // Menus not tested
{
"ddp",
"1.0A 1986-08-08",
@@ -332,6 +335,7 @@
{
// reported by Filippos (thebluegr) in bugreport #1654500
+ // Menus not tested
{
"ddp",
"1.0C 1986-06-09", // verify date
@@ -366,6 +370,7 @@
{
// Gold Rush! (Apple IIgs) 1.0M 2/28/89 (CE) aka 2.01 12/22/88
+ // Menus not tested
{
"goldrush",
"1.0M 1989-02-28 (CE) aka 2.01 1988-12-22",
@@ -455,6 +460,7 @@
{
// King's Quest 1 (Amiga) 1.0U # 2.082
+ // The original game did not have menus, they are enabled under ScummVM
{
"kq1",
"1.0U 1986",
@@ -465,13 +471,14 @@
},
GID_KQ1,
GType_V2,
- 0,
+ GF_MENUS,
0x2440,
},
{
// King's Quest 1 (ST) 1.0V
+ // The original game did not have menus, they are enabled under ScummVM
{
"kq1",
"1.0V 1986",
@@ -482,13 +489,14 @@
},
GID_KQ1,
GType_V2,
- 0,
+ GF_MENUS,
0x2272,
},
{
// King's Quest 1 (IIgs) 1.0S-88223
+ // Menus not tested
{
"kq1",
"1.0S 1988-02-23",
@@ -625,6 +633,7 @@
{
// King's Quest 3 (Amiga) 1.01 11/8/86
+ // The original game did not have menus, they are enabled under ScummVM
{
"kq3",
"1.01 1986-11-08",
@@ -635,13 +644,14 @@
},
GID_KQ3,
GType_V2,
- GF_FORCEMENUS,
+ GF_MENUS,
0x2440,
},
-
+#if 0
{
// King's Quest 3 (ST) 1.02 11/18/86
+ // Problematic: does not have menus, crashes if menus are enforced
{
"kq3",
"1.02 1986-11-18",
@@ -655,8 +665,8 @@
0,
0x2272,
},
+#endif
-
{
// King's Quest 3 (Mac) 2.14 3/15/88
{
@@ -707,9 +717,10 @@
0x3086,
},
-
+#if 0
{
// King's Quest 3 (PC) 1.01 11/08/86 [AGI 2.272]
+ // Problematic: does not have menus, crashes if menus are enforced
{
"kq3",
"1.01 1986-11-08",
@@ -723,8 +734,8 @@
0,
0x2272,
},
+#endif
-
{
// King's Quest 3 (PC 5.25") 2.00 5/25/87 [AGI 2.435]
{
@@ -744,6 +755,7 @@
{
// King's Quest 3 (Mac) 2.14 3/15/88
+ // Menus not tested
{
"kq3",
"2.14 1988-03-15 5.25\"",
@@ -795,6 +807,7 @@
{
// King's Quest 4 (IIgs) 1.0K 11/22/88 (CE)
+ // Menus not tested
{
"kq4",
"1.0K 1988-11-22",
@@ -829,6 +842,7 @@
{
// King's Quest 4 (PC 3.5") 2.2 9/27/88 [AGI 3.002.086]
+ // Menus not tested
{
"kq4",
"2.2 1988-09-27 3.5\"",
@@ -846,6 +860,7 @@
{
// King's Quest 4 demo (PC) [AGI 3.002.102]
+ // Menus not tested
{
"kq4",
"Demo 1988-12-20",
@@ -1099,9 +1114,11 @@
0x3149,
},
-
+#if 0
{
// Mixed-Up Mother Goose (Amiga) 1.1
+ // Problematic: crashes
+ // Menus not tested
{
"mixedup",
"1.1 1986-12-10",
@@ -1115,8 +1132,8 @@
0,
0x3086,
},
+#endif
-
{
// Mixed Up Mother Goose (IIgs)
{
@@ -1154,6 +1171,7 @@
#if 0
{
// Mixed Up Mother Goose (PC) [AGI 2.915] (Broken)
+ // Menus not tested
{
"mixedup",
"[corrupt/OBJECT from disk 1]",
@@ -1308,6 +1326,7 @@
{
// Space Quest 1 (ST) 1.1A
+ // The original game did not have menus, they are enabled under ScummVM
{
"sq1",
"1.1A 1986-02-06",
@@ -1318,13 +1337,14 @@
},
GID_SQ1,
GType_V2,
- 0,
+ GF_MENUS,
0x2440,
},
{
// Space Quest 1 (PC) 1.1A [AGI 2.272]
+ // The original game did not have menus, they are enabled under ScummVM
{
"sq1",
"1.1A 1986-11-13",
@@ -1335,13 +1355,14 @@
},
GID_SQ1,
GType_V2,
- GF_FORCEMENUS,
+ GF_MENUS,
0x2272,
},
{
// Space Quest 1 (Amiga) 1.2 # 2.082
+ // The original game did not have menus, they are enabled under ScummVM
{
"sq1",
"1.2 1986",
@@ -1352,7 +1373,7 @@
},
GID_SQ1,
GType_V2,
- GF_FORCEMENUS,
+ GF_MENUS,
0x2440,
},
@@ -1390,9 +1411,10 @@
0x2917,
},
-
+#if 0
{
// Space Quest 1 (PC) 1.0X [AGI 2.089]
+ // Problematic: does not have menus, crashes if menus are enforced
{
"sq1",
"1.0X 1986-09-24",
@@ -1406,26 +1428,10 @@
0,
0x2089,
},
+#endif
{
- // Space Quest 1 (PC) 1.1A [AGI 2.272]
- {
- "sq1",
- "1.1A 1986-11-13",
- AD_ENTRY1("logdir", "8d8c20ab9f4b6e4817698637174a1cb6"),
- Common::EN_ANY,
- Common::kPlatformPC,
- Common::ADGF_NO_FLAGS
- },
- GID_SQ1,
- GType_V2,
- 0,
- 0x2272,
- },
-
-
- {
// Space Quest 1 (PC 5.25"/3.5") 2.2 [AGI 2.426/2.917]
{
"sq1",
@@ -1552,6 +1558,7 @@
{
// Space Quest 2 (PC 5.25"/ST) 2.0C/A [AGI 2.915]
+ // Menus not tested
{
"sq2",
"2.0C/A 5.25\"/ST",
Modified: scummvm/trunk/engines/agi/keyboard.cpp
===================================================================
--- scummvm/trunk/engines/agi/keyboard.cpp 2007-07-15 05:18:41 UTC (rev 28094)
+++ scummvm/trunk/engines/agi/keyboard.cpp 2007-07-15 06:24:39 UTC (rev 28095)
@@ -127,7 +127,7 @@
}
if (key == BUTTON_LEFT) {
- if ((getflag(fMenusWork) || (getFeatures() & GF_FORCEMENUS)) && g_mouse.y <= CHAR_LINES) {
+ if ((getflag(fMenusWork) || (getFeatures() & GF_MENUS)) && g_mouse.y <= CHAR_LINES) {
newInputMode(INPUT_MENU);
return true;
}
Modified: scummvm/trunk/engines/agi/menu.cpp
===================================================================
--- scummvm/trunk/engines/agi/menu.cpp 2007-07-15 05:18:41 UTC (rev 28094)
+++ scummvm/trunk/engines/agi/menu.cpp 2007-07-15 06:24:39 UTC (rev 28095)
@@ -267,7 +267,7 @@
static int menuActive = false;
static int buttonUsed = 0;
- if (!_vm->getflag(fMenusWork) && !(_vm->getFeatures() & GF_FORCEMENUS))
+ if (!_vm->getflag(fMenusWork) && !(_vm->getFeatures() & GF_MENUS))
return false;
if (!menuActive) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list