[Scummvm-git-logs] scummvm master -> 9982c761a2e5e9bd9129bbeb78c0b749b65baaa4

sluicebox 22204938+sluicebox at users.noreply.github.com
Thu Feb 25 09:20:55 UTC 2021


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9982c761a2 SCI: Update all old bug tracker ticket numbers


Commit: 9982c761a2e5e9bd9129bbeb78c0b749b65baaa4
    https://github.com/scummvm/scummvm/commit/9982c761a2e5e9bd9129bbeb78c0b749b65baaa4
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2021-02-25T01:18:52-08:00

Commit Message:
SCI: Update all old bug tracker ticket numbers

Changed paths:
    engines/sci/detection_tables.h
    engines/sci/engine/kevent.cpp
    engines/sci/engine/kgraphics.cpp
    engines/sci/engine/klists.cpp
    engines/sci/engine/kmath.cpp
    engines/sci/engine/kmenu.cpp
    engines/sci/engine/kmisc.cpp
    engines/sci/engine/kpathing.cpp
    engines/sci/engine/kscripts.cpp
    engines/sci/engine/kstring.cpp
    engines/sci/engine/message.cpp
    engines/sci/engine/object.cpp
    engines/sci/engine/savegame.cpp
    engines/sci/engine/script.cpp
    engines/sci/engine/vm.cpp
    engines/sci/graphics/compare.cpp
    engines/sci/graphics/cursor.cpp
    engines/sci/graphics/menu.cpp
    engines/sci/graphics/palette.cpp
    engines/sci/graphics/picture.cpp
    engines/sci/graphics/ports.cpp
    engines/sci/graphics/view.cpp
    engines/sci/resource/resource.cpp
    engines/sci/sound/drivers/midi.cpp
    engines/sci/sound/midiparser_sci.cpp
    engines/sci/sound/music.cpp
    engines/sci/sound/soundcmd.cpp


diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index 46fabb18f2..b3d4aba5f3 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -76,7 +76,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::DE_DEU, Common::kPlatformAmiga, ADGF_ADDENGLISH, GUIO_STD16	},
 
-	// Castle of Dr. Brain Macintosh (from omer_mor, bug report #3328251)
+	// Castle of Dr. Brain Macintosh (from omer_mor, bug report #5772)
 	{"castlebrain", "", {
 		{"resource.map", 0, "75cb06a94d2e0641295edd043f26f3a8", 2763},
 		{"resource.000", 0, "27ec5fa09cd12a7fd16e86d96a2ed245", 476566},
@@ -95,7 +95,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, ADGF_DEMO, GUIO_STD16	},
 
-	// Castle of Dr. Brain - English DOS 5.25" Floppy EGA (from omer_mor, bug report #3035349)
+	// Castle of Dr. Brain - English DOS 5.25" Floppy EGA (from omer_mor, bug report #4990)
 	{"castlebrain", "EGA", {
 		{"resource.map", 0, "88d106f945f7fd9d1aeda961cfec38a9", 2646},
 		{"resource.000", 0, "6e125f4ce3f4f5c35f2617c7b66c6e21", 25325},
@@ -108,7 +108,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16	},
 
-	// Castle of Dr. Brain - English DOS 3.5" Floppy EGA (from nozomi77, bug report #3405307)
+	// Castle of Dr. Brain - English DOS 3.5" Floppy EGA (from nozomi77, bug report #5841)
 	{"castlebrain", "EGA", {
 		{"resource.map", 0, "dfcf23e36cb81223bdf11166aaf90754", 2730},
 		{"resource.000", 0, "27ec5fa09cd12a7fd16e86d96a2ed245", 300857},
@@ -129,7 +129,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16	},
 
-	// Castle of Dr. Brain - English DOS 5.25" Floppy VGA 1.1 (from rnjacobs, bug report #3578286)
+	// Castle of Dr. Brain - English DOS 5.25" Floppy VGA 1.1 (from rnjacobs, bug report #6162)
 	{"castlebrain", "", {
 		{"resource.map", 0, "a1deac2647ad09472c63656bfb950a4d", 2739},
 		{"resource.000", 0, "27ec5fa09cd12a7fd16e86d96a2ed245", 347071},
@@ -159,7 +159,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		Common::KO_KOR, Common::kPlatformDOS, 0, GUIO_STD16	},
 
 	// Castle of Dr. Brain - English DOS Floppy 1.000
-	// Reported by graxer in bug report #3037942
+	// Reported by graxer in bug report #5094
 	{"castlebrain", "", {
 		{"resource.map", 0, "453daa935535cef68d19704c2b1b78a2", 2649},
 		{"resource.000", 0, "6e125f4ce3f4f5c35f2617c7b66c6e21", 25929},
@@ -312,7 +312,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16_UNDITHER	},
 
-	// Codename: Iceman - English DOS (supplied by ssburnout in bug report #3049193)
+	// Codename: Iceman - English DOS (supplied by ssburnout in bug report #5270)
 	// 1.022 9x5.25" (label: Int#0.000.668)
 	{"iceman", "", {
 		{"resource.map", 0, "2948e06dab4930e4c8098c24ac874db8", 6252},
@@ -327,7 +327,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16_UNDITHER	},
 
-	// Codename: Iceman - English DOS 1.023 (from abevi, bug report #2612718)
+	// Codename: Iceman - English DOS 1.023 (from abevi, bug report #4176)
 	{"iceman", "", {
 		{"resource.map", 0, "da131654de1d6f640222c092313c6ca5", 6252},
 		{"resource.000", 0, "b1bccd827453d4cb834bfd5b45bef63c", 26974},
@@ -493,7 +493,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16	},
 
 	// Conquests of the Longbow DOS 1.0 EGA (4 x 5.25" disks)
-	// Provided by ssburnout in bug report #3046802
+	// Provided by ssburnout in bug report #5257
 	{"longbow", "EGA", {
 		{"resource.map", 0, "0517ca368ec844df0cb21a05020fae01", 6021},
 		{"resource.000", 0, "36e8fda5d0b8c49e587c8a9617959f72", 934643},
@@ -511,7 +511,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, ADGF_DEMO, GUIO_STD16	},
 
-	// Conquests of the Longbow - German DOS (suplied by markcoolio in bug report #2727681, also includes english language)
+	// Conquests of the Longbow - German DOS (suplied by markcoolio in bug report #4294, also includes english language)
 	// SCI interpreter version 1.000.510
 	{"longbow", "", {
 		{"resource.map", 0, "7376b7a07f8bd3a8ab8d67595d3f5b51", 6285},
@@ -607,7 +607,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16	},
 
-	// Eco Quest - German DOS Floppy (supplied by markcoolio in bug report #2723744, also includes english language)
+	// Eco Quest - German DOS Floppy (supplied by markcoolio in bug report #4263, also includes english language)
 	// SCI interpreter version 1.000.510
 	{"ecoquest", "Floppy", {
 		{"resource.map", 0, "7a9b43bf27dc000ac8559ecbe824b659", 4395},
@@ -649,7 +649,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, ADGF_DEMO, GUIO_STD16	},
 
-	// Eco Quest 2 - English DOS Floppy (supplied by markcoolio in bug report #2723761)
+	// Eco Quest 2 - English DOS Floppy (supplied by markcoolio in bug report #4264)
 	// SCI interpreter version 1.001.065
 	{"ecoquest2", "Floppy", {
 		{"resource.map", 0, "28fb7b6abb9fc1cb8882d7c2e701b63f", 5658},
@@ -665,7 +665,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::FR_FRA, Common::kPlatformDOS, 0, GUIO_STD16	},
 
-	// Eco Quest 2 - Spanish DOS Floppy (supplied by umbrio in bug report #3313962)
+	// Eco Quest 2 - Spanish DOS Floppy (supplied by umbrio in bug report #5750)
 	{"ecoquest2", "Floppy", {
 		{"resource.map", 0, "a6b271b934afa7e84d03816a4fefa67b", 5593},
 		{"resource.000", 0, "1c4093f7248240329121fdf8c0d59152", 4209150},
@@ -673,7 +673,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::ES_ESP, Common::kPlatformDOS, 0, GUIO_STD16	},
 
-	// Eco Quest 2 - German DOS Floppy (supplied by frankenbuam in bug report #3615072)
+	// Eco Quest 2 - German DOS Floppy (supplied by frankenbuam in bug report #6416)
 	{"ecoquest2", "Floppy", {
 		{"resource.map", 0, "d8b20073e64f41f6437f73143a186753", 5643},
 		{"resource.000", 0, "cc1d17e5637528dbe4a812699e1cbfc6", 4210876},
@@ -697,7 +697,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, ADGF_CD, GUIO_STD16_SPEECH	},
 
-	// Freddy Pharkas - English DOS Floppy (updated information from markcoolio in bug reports #2723773 and #2724720)
+	// Freddy Pharkas - English DOS Floppy (updated information from markcoolio in bug reports #4267 and #4286)
 	// Executable scanning reports "1.cfs.081"
 	// SCI interpreter version 1.001.132 (just a guess)
 	{"freddypharkas", "Floppy", {
@@ -707,7 +707,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16	},
 
-	// Freddy Pharkas - French DOS Floppy (supplied by misterhands in bug report #3589449)
+	// Freddy Pharkas - French DOS Floppy (supplied by misterhands in bug report #6190)
 	// Executable scanning reports "1.cfs.081"
 	{"freddypharkas", "Floppy", {
 		{"resource.map", 0, "a32674e7fbf7b213b4a066c8037f16b6", 5816},
@@ -716,7 +716,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::FR_FRA, Common::kPlatformDOS, 0, GUIO_STD16	},
 
-	// Freddy Pharkas - Windows (supplied by abevi in bug report #2612718)
+	// Freddy Pharkas - Windows (supplied by abevi in bug report #4176)
 	// Executable scanning reports "1.cfs.081"
 	// SCI interpreter version 1.001.132 (just a guess)
 	{"freddypharkas", "Floppy", {
@@ -725,7 +725,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformWindows, 0, GUIO_STD16	},
 
-	// Freddy Pharkas - German DOS Floppy (from Tobis87, updated information from markcoolio in bug reports #2723772 and #2724720)
+	// Freddy Pharkas - German DOS Floppy (from Tobis87, updated information from markcoolio in bug reports #4266 and #4286)
 	// Executable scanning reports "1.cfs.081"
 	// SCI interpreter version 1.001.132 (just a guess)
 	{"freddypharkas", "", {
@@ -818,7 +818,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO_GK1_FLOPPY },
 
-	// Gabriel Knight - English DOS Floppy (supplied my markcoolio in bug report #2723777)
+	// Gabriel Knight - English DOS Floppy (supplied my markcoolio in bug report #4269)
 	// SCI interpreter version 2.000.000
 	{"gk1", "", {
 		{"resource.map", 0, "65e8c14092e4c9b3b3538b7602c8c5ec", 10783},
@@ -834,7 +834,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO_GK1_FLOPPY },
 
-	// Gabriel Knight - German DOS Floppy (supplied my markcoolio in bug report #2723775)
+	// Gabriel Knight - German DOS Floppy (supplied my markcoolio in bug report #4268)
 	// SCI interpreter version 2.000.000
 	{"gk1", "", {
 		{"resource.map", 0, "ad6508b0296b25c07b1f58828dc33696", 10789},
@@ -842,7 +842,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::DE_DEU, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO_GK1_FLOPPY },
 
-	// Gabriel Knight - French DOS Floppy (supplied my kervala in bug report #3611487)
+	// Gabriel Knight - French DOS Floppy (supplied my kervala in bug report #6281)
 	// SCI interpreter version 2.000.000
 	{"gk1", "", {
 		{"resource.map", 0, "236e36cc847cdeafdd5e5fa8cba916ed", 10801},
@@ -1070,7 +1070,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 #undef GUIO_GK2
 #undef GUIO_GK2_MAC
 
-	// Hoyle 1 - English DOS (supplied by ssburnout in bug report #3049193)
+	// Hoyle 1 - English DOS (supplied by ssburnout in bug report #5270)
 	// 1.000.104 3x5.25" (label:INT.0.000.519)
 	{"hoyle1", "", {
 		{"resource.map", 0, "d6c37503a8f282636e1b08f7a6cf4afd", 7818},
@@ -1080,7 +1080,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16_UNDITHER	},
 
-	// Hoyle 1 - English DOS (supplied by wibble92 in bug report #2644547)
+	// Hoyle 1 - English DOS (supplied by wibble92 in bug report #4203)
 	// SCI interpreter version 0.000.530
 	{"hoyle1", "", {
 		{"resource.map", 0, "9de9aa6d23569b3c8bf798503cf1216a", 7818},
@@ -1090,7 +1090,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16_UNDITHER	},
 
-	// Hoyle 1 - English DOS (supplied by merkur in bug report #2719227)
+	// Hoyle 1 - English DOS (supplied by merkur in bug report #4255)
 	// SCI interpreter version 0.000.530
 	{"hoyle1", "", {
 		{"resource.map", 0, "1034a218943d12f1f36e753fa10c95b8", 4386},
@@ -1098,7 +1098,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16_UNDITHER	},
 
-	// Hoyle 1 3.5' - English DOS (supplied by eddydrama in bug report #3052366 and dinnerx in bug report #3090841)
+	// Hoyle 1 3.5' - English DOS (supplied by eddydrama in bug report #5300 and dinnerx in bug report #5460)
 	{"hoyle1", "", {
 		{"resource.map", 0, "0af9a3dcd72a091960de070432e1f524", 4386},
 		{"resource.001", 0, "e0dd44069a62a463fd124974b915f10d", 518127},
@@ -1156,7 +1156,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16_UNDITHER	},
 
-	// Hoyle 2 - English DOS (supplied by ssburnout in bug report #3049193)
+	// Hoyle 2 - English DOS (supplied by ssburnout in bug report #5270)
 	// 1.000.011 1x3.5" (label:Int#6.21.90)
 	{"hoyle2", "", {
 		{"resource.map", 0, "db0ba08b953e9904a4960ad99cd29c20", 1356},
@@ -1236,7 +1236,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16	},
 
-	// Hoyle 3 - English DOS Floppy (supplied by eddydrama in bug report #3038837)
+	// Hoyle 3 - English DOS Floppy (supplied by eddydrama in bug report #5119)
 	{"hoyle3", "", {
 		{"resource.map", 0, "31c9fc0977ac6e5b566c37096803d0cb", 2469},
 		{"resource.000", 0, "6ef28cac094dcd97fdb461662ead6f92", 12070},
@@ -1247,7 +1247,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16	},
 
-	// Hoyle 3 EGA - English DOS Floppy 1.0 (supplied by abevi in bug report #2612718)
+	// Hoyle 3 EGA - English DOS Floppy 1.0 (supplied by abevi in bug report #4176)
 	{"hoyle3", "EGA", {
 		{"resource.map", 0, "1728af1f6a85938c3522e64449e76ca1", 2205},
 		{"resource.000", 0, "6ef28cac094dcd97fdb461662ead6f92", 319905},
@@ -1272,7 +1272,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		Common::EN_ANY, Common::kPlatformDOS, ADGF_DEMO, GUIO_STD16	},
 
 	// Hoyle 4 (Hoyle Classic Card Games) - English DOS/Win
-	// Supplied by abevi in bug report #3039291
+	// Supplied by abevi in bug report #5131
 	{"hoyle4", "", {
 		{"resource.map", 0, "2b577c975cc8d8d43f61b6a756129fe3", 4352},
 		{"resource.000", 0, "43e2c15ce436aab611a462ad0603e12d", 2000132},
@@ -1402,7 +1402,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_JONES_FLOPPY	},
 
-	// Jones in the Fast Lane EGA - English DOS (supplied by EddyDrama in bug report #3038761)
+	// Jones in the Fast Lane EGA - English DOS (supplied by EddyDrama in bug report #5117)
 	{"jones", "EGA", {
 		{"resource.map", 0, "8e92cf319180cc8b5b87b2ce93a4fe22", 1602},
 		{"resource.001", 0, "bac3ec6cb3e3920984ab0f32becf5163", 511528},
@@ -1418,7 +1418,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_JONES_FLOPPY	},
 
-	// Jones in the Fast Lane VGA - English DOS (supplied by omer_mor in bug report #3037054)
+	// Jones in the Fast Lane VGA - English DOS (supplied by omer_mor in bug report #5053)
 	// VERSION file reports "1.000.060"
 	{"jones", "", {
 		{"resource.map", 0, "db175ab494ab0666f19ab8f2597a8e49", 1602},
@@ -1443,7 +1443,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		Common::EN_ANY, Common::kPlatformWindows, ADGF_CD, GUIO_JONES_CD_WINDOWS	},
 
 	// Jones in the Fast Lane - English DOS US CD (alternate version)
-	// Supplied by collector9 in bug #3614668
+	// Supplied by collector9 in bug #6372
 	{"jones", "CD", {
 		{"resource.map", 0, "4344ff3f796707843b992adec2c87663", 4878},
 		{"resource.001", 0, "3876da2ce16fb7dea2f5d943d946fa84", 1652062},
@@ -1506,7 +1506,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::KO_KOR, Common::kPlatformDOS, 0, GUIO_STD16_UNDITHER	},
 
-	// King's Quest 1 SCI Remake - English DOS (supplied by ssburnout in bug report #3049193)
+	// King's Quest 1 SCI Remake - English DOS (supplied by ssburnout in bug report #5270)
 	// 1.000.051 9x5.25" (label: INT#9.19.90)
 	{"kq1sci", "SCI", {
 		{"resource.map", 0, "4dac689e98b2fa6806232fdd61e24712", 9936},
@@ -1577,7 +1577,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16_UNDITHER	},
 
-	// King's Quest 4 - English DOS (supplied by ssburnout in bug report #3049193)
+	// King's Quest 4 - English DOS (supplied by ssburnout in bug report #5270)
 	// 1.006.003 8x5.25" (label: Int.#0.000.502)
 	{"kq4sci", "SCI", {
 		{"resource.map", 0, "a22b66e6fa0d82460b985e9f7e562950", 9384},
@@ -1622,7 +1622,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 	// King's Quest 4 - English Atari ST (double-sided diskettes)
 	// Game version 1.003.006 (January 12, 1989)
 	// SCI interpreter version 1.001.008
-	// Provided by fischersfritz in bug report #3110941
+	// Provided by fischersfritz in bug report #5518
 	{"kq4sci", "SCI", {
 		{"resource.map", 0, "8800cd62b1eee93752099986dc704a16", 7416},
 		{"resource.001", 0, "a3cdb4848fb859fdd302976fff56490f", 450790},
@@ -1735,7 +1735,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 
 	// King's Quest 5 - English DOS Floppy
 	// VERSION file reports "0.000.051"
-	// Supplied by misterhands in bug report #3536863.
+	// Supplied by misterhands in bug report #6056.
 	// This is the original English version, which has been externally patched to
 	// Polish in the Polish release below.
 	{"kq5", "", {
@@ -1751,7 +1751,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16	},
 
-	// King's Quest 5 - English DOS Floppy (supplied by omer_mor in bug report #3036996)
+	// King's Quest 5 - English DOS Floppy (supplied by omer_mor in bug report #5048)
 	// VERSION file reports "0.000.051"
 	{"kq5", "", {
 		{"resource.map", 0, "8b2158083302568b73b16fa3655360fe", 8184},
@@ -1766,7 +1766,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16	},
 
-	// King's Quest 5 EGA (supplied by markcoolio in bug report #2829470)
+	// King's Quest 5 EGA (supplied by markcoolio in bug report #4496)
 	// SCI interpreter version 1.000.060
 	// VERSION file reports "0.000.055"
 	{"kq5", "EGA", {
@@ -1794,7 +1794,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16	},
 
-	// King's Quest 5 EGA (supplied by omer_mor in bug report #3035421)
+	// King's Quest 5 EGA (supplied by omer_mor in bug report #4997)
 	// VERSION file reports "0.000.062"
 	{"kq5", "EGA", {
 		{"resource.map", 0, "e17cfb38175382b9188da75c53bbab64", 7656},
@@ -1825,7 +1825,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16	},
 
 	// King's Quest V DOS 0.000.062 EGA (5 x 5.25" disks)
-	// Supplied by ssburnout in bug report #3046780
+	// Supplied by ssburnout in bug report #5254
 	{"kq5", "EGA", {
 		{"resource.map", 0, "ef4fdc72ca7aef62054e8b075d7960d8", 7596},
 		{"resource.000", 0, "a591bd4b879fc832b8095c0b3befe9e2", 413648},
@@ -1837,7 +1837,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16	},
 
 	// King's Quest 5 DOS Spanish Floppy 0.000.062 VGA (5 x 3.5" disks)
-	// Supplied by dianiu in bug report #3555646
+	// Supplied by dianiu in bug report #6121
 	{"kq5", "", {
 		{"resource.map", 0, "c09896a2a30c9b002c5cbbc62f5a5c3a", 8169},
 		{"resource.000", 0, "1f1d03aead44da46362ff40c0074a3ec", 335871},
@@ -1851,7 +1851,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::ES_ESP, Common::kPlatformDOS, ADGF_ADDENGLISH, GUIO_STD16	},
 
-	// King's Quest 5 - German DOS Floppy (supplied by markcoolio in bug report #2727101, also includes english language)
+	// King's Quest 5 - German DOS Floppy (supplied by markcoolio in bug report #4290, also includes english language)
 	// SCI interpreter version 1.000.060
 	{"kq5", "", {
 		{"resource.map", 0, "bff44f0c326a71b1757c793a02b502d6", 8283},
@@ -1867,7 +1867,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		Common::DE_DEU, Common::kPlatformDOS, ADGF_ADDENGLISH, GUIO_STD16	},
 
 	// King's Quest 5 - French DOS Floppy (from the King's Quest Collector's Edition 1994, also includes english language)
-	// Supplied by aroenai in bug report #2812611
+	// Supplied by aroenai in bug report #4378
 	// VERSION file reports "1.000", SCI interpreter version 1.000.784
 	{"kq5", "", {
 		{"resource.map", 0, "eb7853832f3bb10900b13b421a0bbe7f", 8283},
@@ -1897,10 +1897,10 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::IT_ITA, Common::kPlatformDOS, ADGF_ADDENGLISH, GUIO_STD16	},
 
-	// King's Quest 5 - Polish DOS Floppy (supplied by jacek909 in bug report #2725722)
+	// King's Quest 5 - Polish DOS Floppy (supplied by jacek909 in bug report #4288)
 	// SCI interpreter version 1.000.060
 	// VERSION file reports "0.000.051".
-	// This is actually an English version with external text resource patches (bug #3536863).
+	// This is actually an English version with external text resource patches (bug #6056).
 	{"kq5", "", {
 		{"resource.map", 0, "70010c20138541f89013bb5e1b30f16a", 7998},
 		{"resource.000", 0, "a591bd4b879fc832b8095c0b3befe9e2", 276398},
@@ -1939,7 +1939,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformMacintosh, 0, GUIO_STD16_MAC },
 
-	// King's Quest 5 - FM-Towns (supplied by abevi in bug report #3038720)
+	// King's Quest 5 - FM-Towns (supplied by abevi in bug report #5114)
 	{"kq5", "", {
 		{"resource.map", 0, "20c7cd248ff1a349ed354568eebd972b", 12733},
 		{"resource.000", 0, "71afd220d46bde1109c58e6acc0f3a01", 469094},
@@ -1947,7 +1947,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::JA_JPN, Common::kPlatformFMTowns, ADGF_ADDENGLISH, GUIO4(GUIO_NOASPECT, GAMEOPTION_ORIGINAL_SAVELOAD, GUIO_MIDITOWNS, GAMEOPTION_RGB_RENDERING) },
 
-	// King's Quest 5 - Japanese PC-98 Floppy 0.000.015 (supplied by omer_mor in bug report #3073583)
+	// King's Quest 5 - Japanese PC-98 Floppy 0.000.015 (supplied by omer_mor in bug report #5384)
 	{"kq5", "", {
 		{"resource.map", 0, "3bca188108ec5b6ad91612483a6cbc27", 7875},
 		{"resource.000", 0, "70d6a2ec17fd49a63217992fc4347cd9", 493681},
@@ -2010,7 +2010,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16	},
 
-	// King's Quest 6 - French DOS Floppy (supplied by misterhands in bug #3503425)
+	// King's Quest 6 - French DOS Floppy (supplied by misterhands in bug #6005)
 	// SCI interpreter version ???
 	{"kq6", "", {
 		{"resource.map", 0, "a362063318eebe7d6423b1d9dc6213e1", 8703},
@@ -2019,7 +2019,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::FR_FRA, Common::kPlatformDOS, 0, GUIO_STD16	},
 
-	// King's Quest 6 - German DOS Floppy (supplied by markcoolio in bug report #2727156)
+	// King's Quest 6 - German DOS Floppy (supplied by markcoolio in bug report #4291)
 	// SCI interpreter version 1.001.054
 	{"kq6", "", {
 		{"resource.map", 0, "a362063318eebe7d6423b1d9dc6213e1", 8703},
@@ -2038,7 +2038,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::ES_ESP, Common::kPlatformDOS, 0, GUIO_STD16	},
 
-	// King's Quest 6 - Italian DOS Floppy (supplied by guybrush79 in bug report #3606719)
+	// King's Quest 6 - Italian DOS Floppy (supplied by guybrush79 in bug report #6258)
 	{"kq6", "", {
 		{"resource.map", 0, "48c9fc8e96cbdac078ca7d3df274e29a", 8942},
 		{"resource.000", 0, "d3358ba7306378aed83d02b5c3f11311", 8531908},
@@ -2150,7 +2150,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, GUIO_KQ7 },
 
-	// King's Quest 7 - German Windows-interpreter-only (supplied by markcoolio in bug report #2727402)
+	// King's Quest 7 - German Windows-interpreter-only (supplied by markcoolio in bug report #4292)
 	// SCI interpreter version 2.100.002, VERSION file reports "1.51"
 	// same as English 1.51, only resource.aud/resource.sfx are different
 	{"kq7", "", {
@@ -2432,7 +2432,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::FR_FRA, Common::kPlatformDOS, 0, GUIO_STD16	},
 
-	// Laura Bow 2 v1.1 - German DOS Floppy (from Tobis87, updated info from  markcoolio in bug report #2723787, updated info from #2797962))
+	// Laura Bow 2 v1.1 - German DOS Floppy (from Tobis87, updated info from  markcoolio in bug report #4270, updated info from #4355))
 	// Executable scanning reports "2.000.274"
 	{"laurabow2", "", {
 		{"resource.map", 0, "3b6dfbcda210bbc3f23fd1927113bf98", 6483},
@@ -2505,7 +2505,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16	},
 
-	// Larry 1 VGA Remake - English Macintosh (from omer_mor, bug report #3328262)
+	// Larry 1 VGA Remake - English Macintosh (from omer_mor, bug report #5774)
 	{"lsl1sci", "SCI", {
 		{"resource.map", 0, "6395e7f7881e37e39d81ff5175a35f6f", 3237},
 		{"resource.000", 0, "5933df4ea688584d6f59fdea5a9404f8", 989066},
@@ -2614,7 +2614,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16_PALETTEMODS	},
 
-	// Larry 2 - English DOS (supplied by ssburnout in bug report #3049193)
+	// Larry 2 - English DOS (supplied by ssburnout in bug report #5270)
 	// 1.000.011 3x3.5" (label: Int. #0.000.343)
 	{"lsl2", "", {
 		{"resource.map", 0, "e5caa855a5be78c53a6a92157d0b9f5c", 4740},
@@ -2624,7 +2624,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16_PALETTEMODS	},
 
-	// Larry 2 - English DOS (supplied by ssburnout in bug report #3049193)
+	// Larry 2 - English DOS (supplied by ssburnout in bug report #5270)
 	// 1.002.000 3x3.5" (label: INT#0.000.409)
 	{"lsl2", "", {
 		{"resource.map", 0, "2c9c3b0923e3764f5ab999bcb71c2d47", 4758},
@@ -2720,7 +2720,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformAtariST, 0, GUIO_STD16	},
 
-	// Larry 3 - English DOS (supplied by ssburnout in bug report #3049193)
+	// Larry 3 - English DOS (supplied by ssburnout in bug report #5270)
 	// 1.021 8x5.25" (label: Int#5.15.90)
 	{"lsl3", "", {
 		{"resource.map", 0, "a39a20580362af3437352dbc717734f8", 7452},
@@ -2759,7 +2759,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16_UNDITHER	},
 
-	// Larry 3 - English DOS (supplied by kervala in bug report #3611488)
+	// Larry 3 - English DOS (supplied by kervala in bug report #6282)
 	{"lsl3", "", {
 		{"resource.map", 0, "534d8946f10bc71a71b5bf89a84c31be", 5916},
 		{"resource.001", 0, "f18441027154292836b973c655fa3175", 456265},
@@ -2778,7 +2778,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, ADGF_DEMO, GUIO_STD16_UNDITHER	},
 
-	// Larry 3 - German DOS (from Tobis87, updated info from markcoolio in bug report #2723832, also includes english language)
+	// Larry 3 - German DOS (from Tobis87, updated info from markcoolio in bug report #4274, also includes english language)
 	// Executable scanning reports "S.old.123"
 	// SCI interpreter version 0.000.572 (just a guess)
 	{"lsl3", "", {
@@ -2804,7 +2804,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::DE_DEU, Common::kPlatformDOS, ADGF_ADDENGLISH, GUIO_STD16_UNDITHER	},
 
-	// Larry 3 - French DOS (provided by richiefs in bug report #2670691, also includes english language)
+	// Larry 3 - French DOS (provided by richiefs in bug report #4214, also includes english language)
 	// Executable scanning reports "S.old.123"
 	// SCI interpreter version 0.000.572 (just a guess)
 	{"lsl3", "", {
@@ -2817,7 +2817,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		Common::FR_FRA, Common::kPlatformDOS, ADGF_ADDENGLISH, GUIO_STD16_UNDITHER	},
 
 	// Larry 3 1.050 Fr/En (9 x 5.25" disks)
-	// Provided by ssburnout in bug report #3046779
+	// Provided by ssburnout in bug report #5253
 	{"lsl3", "", {
 		{"resource.map", 0, "527277cee7b31dd603229443b48e70c4", 8910},
 		{"resource.001", 0, "65f1bdaa20f6d0470e9d969f22473873", 162132},
@@ -2904,7 +2904,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16	},
 
-	// Larry 5 - English Macintosh (from omer_mor, bug report #3328257)
+	// Larry 5 - English Macintosh (from omer_mor, bug report #5773)
 	{"lsl5", "", {
 		{"resource.map", 0, "f12439da78b9878e16436661deb83f84", 6525},
 		{"resource.000", 0, "f2537473213d70e7f4fc82e988ab90ca", 702403},
@@ -2933,7 +2933,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::DE_DEU, Common::kPlatformDOS, ADGF_ADDENGLISH, GUIO_STD16	},
 
-	// Larry 5 - French DOS (provided by richiefs in bug report #2670691)
+	// Larry 5 - French DOS (provided by richiefs in bug report #4214)
 	// Executable scanning reports "1.lsl5.019"
 	// SCI interpreter version 1.000.510 (just a guess)
 	{"lsl5", "", {
@@ -2974,7 +2974,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		Common::IT_ITA, Common::kPlatformDOS, 0, GUIO_STD16	},
 
 	// Larry 5 1.0 EGA DOS (8 x 3.5" disks)
-	// Provided by ssburnout in bug report #3046806
+	// Provided by ssburnout in bug report #5259
 	{"lsl5", "EGA", {
 		{"resource.map", 0, "1370ae356fdda2e7f9ea56dda3ff9a57", 6597},
 		{"resource.000", 0, "f2537473213d70e7f4fc82e988ab90ca", 248416},
@@ -2989,7 +2989,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16	},
 
 	// Larry 5 EGA
-	// Supplied by omer_mor in bug report #3049771
+	// Supplied by omer_mor in bug report #5281
 	{"lsl5", "EGA", {
 		{"resource.map", 0, "89dbf8006985ec0c547ffe125c25ebf9", 6255},
 		{"resource.000", 0, "f2537473213d70e7f4fc82e988ab90ca", 765747},
@@ -3031,7 +3031,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, ADGF_CD, GUIO_STD16_SPEECH	},
 
-	// Larry 6 - German DOS CD - LOWRES (provided by richiefs in bug report #2670691)
+	// Larry 6 - German DOS CD - LOWRES (provided by richiefs in bug report #4214)
 	// SCI interpreter version 1.001.115
 	{"lsl6", "CD", {
 		{"resource.map", 0, "bafe85f32738854135991d4324ad147e", 7268},
@@ -3039,7 +3039,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::DE_DEU, Common::kPlatformDOS, ADGF_CD, GUIO_STD16_SPEECH	},
 
-	// Larry 6 - French DOS CD - LOWRES (provided by richiefs in bug report #2670691)
+	// Larry 6 - French DOS CD - LOWRES (provided by richiefs in bug report #4214)
 	// SCI interpreter version 1.001.115
 	{"lsl6", "CD", {
 		{"resource.map", 0, "97797ea775baaf18a1907d357d3c0ea6", 7268},
@@ -3113,7 +3113,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO_LSL6HIRES },
 
-	// Larry 6 - German DOS CD - HIRES (provided by richiefs in bug report #2670691)
+	// Larry 6 - German DOS CD - HIRES (provided by richiefs in bug report #4214)
 	// SCI interpreter version 2.100.002
 	{"lsl6hires", "Hi-res", {
 		{"resource.map", 0, "badfdf446ffed569a310d2c63a249421", 8896},
@@ -3121,7 +3121,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::DE_DEU, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO_LSL6HIRES },
 
-	// Larry 6 - French DOS CD - HIRES (provided by richiefs in bug report #2670691)
+	// Larry 6 - French DOS CD - HIRES (provided by richiefs in bug report #4214)
 	// SCI interpreter version 2.100.002
 	{"lsl6hires", "Hi-res", {
 		{"resource.map", 0, "d184e9aa4f2d4b5670ddb3669db82cda", 8896},
@@ -3161,7 +3161,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
                              GAMEOPTION_HQ_VIDEO, \
                              GAMEOPTION_LARRYSCALE)
 
-	// Larry 7 - English DOS Demo (provided by richiefs in bug report #2670691)
+	// Larry 7 - English DOS Demo (provided by richiefs in bug report #4214)
 	// SCI interpreter version 2.100.002
 	{"lsl7", "Demo", {
 		{"ressci.000", 0, "5cc6159688b2dc03790a67c90ccc67f9", 10195878},
@@ -3185,7 +3185,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::DE_DEU, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO_LSL7 },
 
-	// Larry 7 - French DOS (provided by richiefs in bug report #2670691)
+	// Larry 7 - French DOS (provided by richiefs in bug report #4214)
 	// SCI interpreter version 3.000.000
 	{"lsl7", "", {
 		{"resmap.000", 0, "4407849fd52fe3efb0c30fba60cd5cd4", 8206},
@@ -3394,7 +3394,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, ADGF_DEMO, GUIO_STD16	},
 
-	// Mixed-Up Fairy Tales - English DOS Floppy EGA (from omer_mor, bug report #3035350)
+	// Mixed-Up Fairy Tales - English DOS Floppy EGA (from omer_mor, bug report #4991)
 	{"fairytales", "EGA", {
 		{"resource.map", 0, "daa94e9f327be6657eb97a51b490dbb1", 3219},
 		{"resource.000", 0, "6dc287611e510793b72e73110bbdd45d", 17819},
@@ -3416,7 +3416,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16_UNDITHER	},
 
-	// Mixed-Up Fairy Tales v1.000 - English DOS (supplied by markcoolio in bug report #2723791)
+	// Mixed-Up Fairy Tales v1.000 - English DOS (supplied by markcoolio in bug report #4271)
 	// Executable scanning reports "1.000.145"
 	{"fairytales", "", {
 		{"resource.map", 0, "9ae5aecc1cb797b11ea5cf0caeea272c", 3261},
@@ -3449,7 +3449,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_STD16	},
 
-	// Mixed-Up Mother Goose - English DOS Floppy EGA (from omer_mor, bug report #3035354)
+	// Mixed-Up Mother Goose - English DOS Floppy EGA (from omer_mor, bug report #4992)
 	{"mothergoose", "EGA", {
 		{"resource.map", 0, "3490f85dab47e504c41b7eb3312e285e", 2598},
 		{"resource.001", 0, "d893892d62b3f061357291d66775e360", 239906},
@@ -3457,7 +3457,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16_UNDITHER	},
 
-	// Mixed-Up Mother Goose - English DOS Floppy EGA (supplied by ssburnout in bug report #3049193)
+	// Mixed-Up Mother Goose - English DOS Floppy EGA (supplied by ssburnout in bug report #5270)
 	// 1.011 5x5.25" (label: Int#8.2.90)
 	{"mothergoose", "EGA", {
 		{"resource.map", 0, "7d308bfc6006d0e20985a7295c238efc", 2010},
@@ -3470,7 +3470,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16_UNDITHER	},
 
-	// Mixed-Up Mother Goose v2.000 - English DOS Floppy (supplied by markcoolio in bug report #2723795)
+	// Mixed-Up Mother Goose v2.000 - English DOS Floppy (supplied by markcoolio in bug report #4272)
 	// Executable scanning reports "1.001.031"
 	{"mothergoose256", "", {
 		{"resource.map", 0, "52aae15e493cafd1da7e1c9b657a5bb9", 7026},
@@ -3495,7 +3495,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO, GUIO_STD16	},
 
-	// Mixed-Up Mother Goose - FM-Towns (supplied by abevi in bug report #3038720)
+	// Mixed-Up Mother Goose - FM-Towns (supplied by abevi in bug report #5114)
 	{"mothergoose256", "", {
 		{"resource.map", 0, "b11e971ccd2040bebba59dfb409a08ef", 5772},
 		{"resource.001", 0, "d49625d9b8005ec01c852f8322a82867", 4330713},
@@ -3507,7 +3507,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
                                     GUIO_LINKSPEECHTOSFX, \
                                     GUIO_NOLAUNCHLOAD)
 
-	// Mixed-Up Mother Goose Deluxe - EN/ES Windows CD (supplied by markcoolio in bug report #2723810)
+	// Mixed-Up Mother Goose Deluxe - EN/ES Windows CD (supplied by markcoolio in bug report #4273)
 	// Executable scanning reports "2.100.002"
 	{"mothergoosehires", "", {
 		{"resource.map", 0, "5159a1578c4306bfe070a3e4d8c2e1d3", 4741},
@@ -3686,7 +3686,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 	// Windows executable scanning reports "2.100.002" - "Sep 19 1995 15:09:43"
 	// DOS executable scanning reports "2.100.002" - "Sep 19 1995 09:15:40"
 	// VERSION file reports "1.000.001UK"
-	// Supplied by littleboy in patch #3112884
+	// Supplied by littleboy in trac #9255
 	{"phantasmagoria", "", {
 		{"ressci.000", 0, "cd5967f9b9586e3380645961c0765be3", 116822037},
 		{"resmap.000", 0, "3cafc1c6a53945c1f3babbfd6380c64c", 16468},
@@ -3900,7 +3900,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, ADGF_DEMO, GUIO_STD16_UNDITHER	},
 
-	// Police Quest 2 - English DOS (provided by richiefs in bug report #2670691)
+	// Police Quest 2 - English DOS (provided by richiefs in bug report #4214)
 	// SCI interpreter version 0.000.395
 	{"pq2", "", {
 		{"resource.map", 0, "9cff78c4be9e6a4848b6e9377569e3d9", 5700},
@@ -3944,7 +3944,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16_UNDITHER	},
 
-	// Police Quest 2 English DOS 1.001.006 (supplied by merkur-kun in bug report #3028479)
+	// Police Quest 2 English DOS 1.001.006 (supplied by merkur-kun in bug report #4922)
 	{"pq2", "", {
 		{"resource.map", 0, "8e1161c684b342742d30f938a4839a4b", 4518},
 		{"resource.001", 0, "77f02def3094af804fd2371db25b7100", 506563},
@@ -4034,7 +4034,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, ADGF_DEMO, GUIO_STD16	},
 
-	// Police Quest 3 - German DOS (supplied by markcoolio in bug report #2723837, also includes english language)
+	// Police Quest 3 - German DOS (supplied by markcoolio in bug report #4275, also includes english language)
 	// Executable scanning reports "T.A00.178"
 	// SCI interpreter version 1.000.510
 	{"pq3", "", {
@@ -4047,7 +4047,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::DE_DEU, Common::kPlatformDOS, ADGF_ADDENGLISH, GUIO_STD16	},
 
-	// Police Quest 3 - Spanish DOS v1.000 - Supplied by dianiu in bug report #3555647
+	// Police Quest 3 - Spanish DOS v1.000 - Supplied by dianiu in bug report #6122
 	{"pq3", "", {
 		{"resource.map", 0, "ffa0b4631c4e36d69631256d19ba29e7", 5421},
 		{"resource.000", 0, "5ee460af3d70c06a745cc482b6c783ba", 5410263},
@@ -4055,7 +4055,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		Common::ES_ESP, Common::kPlatformDOS, ADGF_ADDENGLISH, GUIO_STD16	},
 
 	// Police Quest 3 EGA
-	// Reported by musiclyinspired in bug report #3046573
+	// Reported by musiclyinspired in bug report #5251
 	{"pq3", "EGA", {
 		{"resource.map", 0, "1341f7c9643947414a8e238b88f68d82", 5901},
 		{"resource.000", 0, "7659713720d61d9465a59091b7ee63ea", 402208},
@@ -4100,7 +4100,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		Common::FR_FRA, Common::kPlatformDOS, ADGF_CD, GUIO_PQ4_CD },
 
 	// Police Quest 4 - German DOS CD (German text, English speech)
-	// Supplied by markcoolio in bug report #3392955
+	// Supplied by markcoolio in bug report #5830
 	{"pq4", "CD", {
 		{"resource.map", 0, "a398076371ed0e1e706c8f9fb9fc7ac5", 11386},
 		{"resource.000", 0, "6ff21954e0a2c5992279e7eb787c8d56", 18918747},
@@ -4115,7 +4115,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO_PQ4_FLOPPY },
 
-	// Police Quest 4 - French DOS (supplied by abevi in bug report #2612718)
+	// Police Quest 4 - French DOS (supplied by abevi in bug report #4176)
 	// SCI interpreter version 2.000.000
 	{"pq4", "", {
 		{"resource.map", 0, "008030846edcc7c5c7a812c7f4ae4ceb", 9256},
@@ -4123,7 +4123,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::FR_FRA, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO_PQ4_FLOPPY },
 
-	// Police Quest 4 - German DOS (supplied by markcoolio in bug report #2723840)
+	// Police Quest 4 - German DOS (supplied by markcoolio in bug report #4276)
 	// SCI interpreter version 2.000.000 (a guess?)
 	{"pq4", "", {
 		{"resource.map", 0, "2393ee728ab930b2762cb5889f9b5aff", 9256},
@@ -4220,7 +4220,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 #undef GUIO_PQSWAT_DEMO
 #undef GUIO_PQSWAT
 
-	// Quest for Glory 1 / Hero's Quest - English DOS 3.5" Floppy (supplied by merkur in bug report #2718784)
+	// Quest for Glory 1 / Hero's Quest - English DOS 3.5" Floppy (supplied by merkur in bug report #4253)
 	// Executable scanning reports "0.000.566"
 	{"qfg1", "", {
 		{"resource.map", 0, "c1dc4470fb947c067567252f62d6c1b6", 6474},
@@ -4232,7 +4232,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16_UNDITHER },
 
-	// Quest for Glory 1 / Hero's Quest - English DOS 3.5" Floppy v1.001 Int#0.000.566 (supplied by alonzotg in bug report #3206006)
+	// Quest for Glory 1 / Hero's Quest - English DOS 3.5" Floppy v1.001 Int#0.000.566 (supplied by alonzotg in bug report #5606)
 	{"qfg1", "", {
 		{"resource.map", 0, "85512508ed4e4ef1e3b309adabceeda9", 6486},
 		{"resource.000", 0, "481b034132106390cb5160fe61dd5f58", 80334},
@@ -4243,7 +4243,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16_UNDITHER },
 
-	// Quest for Glory 1 / Hero's Quest - English DOS 3.5" Floppy v1.102 Int#0.000.629 (suppled by digitoxin1 in bug report #3554611)
+	// Quest for Glory 1 / Hero's Quest - English DOS 3.5" Floppy v1.102 Int#0.000.629 (suppled by digitoxin1 in bug report #6115)
 	{"qfg1", "", {
 		{"resource.map", 0, "b162dbd4632250d4d83bed46d0783c10", 6396},
 		{"resource.000", 0, "40332d3ebfc70a4b6a6a0443c2763287", 78800},
@@ -4254,7 +4254,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16_UNDITHER	},
 
-	// Quest for Glory 1 / Hero's Quest - English DOS 5.25" Floppy v1.102 Int#0.000.629 (suppled by digitoxin1 in bug report #3554611)
+	// Quest for Glory 1 / Hero's Quest - English DOS 5.25" Floppy v1.102 Int#0.000.629 (suppled by digitoxin1 in bug report #6115)
 	{"qfg1", "", {
 		{"resource.map", 0, "5772a2c1bfae46f26582582c9901121e", 6858},
 		{"resource.000", 0, "40332d3ebfc70a4b6a6a0443c2763287", 78800},
@@ -4268,7 +4268,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16_UNDITHER },
 
-	// Quest for Glory 1 / Hero's Quest - English DOS 5.25" Floppy (supplied by markcoolio in bug report #2723843)
+	// Quest for Glory 1 / Hero's Quest - English DOS 5.25" Floppy (supplied by markcoolio in bug report #4277)
 	// Executable scanning reports "0.000.566"
 	{"qfg1", "", {
 		{"resource.map", 0, "94bc3f2ae2dad12f1303606740d087ff", 6936},
@@ -4283,7 +4283,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16_UNDITHER },
 
-	// Quest for Glory 1 / Hero's Quest - English DOS 5.25" Floppy (supplied by ssburnout in bug report #3049193)
+	// Quest for Glory 1 / Hero's Quest - English DOS 5.25" Floppy (supplied by ssburnout in bug report #5270)
 	// 1.001 10x5.25" (label: INT.#0.000.566)
 	{"qfg1", "", {
 		{"resource.map", 0, "c5a0346ff16c43b1eea9583d15e7743c", 6948},
@@ -4298,7 +4298,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16_UNDITHER	},
 
-	// Quest for Glory 1 / Hero's Quest - English DOS 5.25" Floppy (supplied by ssburnout in bug report #3049193)
+	// Quest for Glory 1 / Hero's Quest - English DOS 5.25" Floppy (supplied by ssburnout in bug report #5270)
 	// 1.200 10x5.25" (label: INT#9.10.90)
 	{"qfg1", "", {
 		{"resource.map", 0, "96939838dd9aa17b110c25256f04dd0b", 6906},
@@ -4430,7 +4430,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_STD16_UNDITHER	},
 
-	// Quest for Glory 2 - English (supplied by ssburnout in bug report #3049193)
+	// Quest for Glory 2 - English (supplied by ssburnout in bug report #5270)
 	// 1.000 5x5.25" (label: INT#10.31.90)
 	{"qfg2", "", {
 		{"resource.map", 0, "5b07fa7ea23afb7dd6804e64e7f7470f", 6906},
@@ -4442,7 +4442,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16_UNDITHER	},
 
-	// Quest for Glory 2 - English (supplied by ssburnout in bug report #3049193)
+	// Quest for Glory 2 - English (supplied by ssburnout in bug report #5270)
 	// 1.000 9x3.5" (label: INT#10.31.90)
 	{"qfg2", "", {
 		{"resource.map", 0, "1e30119a632a53eb8343fff7c9989025", 8148},
@@ -4484,7 +4484,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16_UNDITHER	},
 
-	// Quest for Glory 2 - English DOS (supplied by digitoxin1 in bug report #3554614)
+	// Quest for Glory 2 - English DOS (supplied by digitoxin1 in bug report #6116)
 	// v1.102 9x3.5" (label: Int#11.20.90)
 	{"qfg2", "", {
 		{"resource.map", 0, "367023314ea33e3156297402f6c1da49", 8166},
@@ -4523,7 +4523,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16	},
 
-	// Quest for Glory 3 - English DOS (supplied by abevi in bug report #2612718)
+	// Quest for Glory 3 - English DOS (supplied by abevi in bug report #4176)
 	// SCI interpreter version 1.001.050
 	{"qfg3", "", {
 		{"resource.map", 0, "62c185d190363d7df06330fa0cc45b36", 5958},
@@ -4531,7 +4531,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16	},
 
-	// Quest for Glory 3 - English DOS (supplied by dknute in bug report #3125559)
+	// Quest for Glory 3 - English DOS (supplied by dknute in bug report #5542)
 	{"qfg3", "", {
 		{"resource.map", 0, "19e2bf9b693932b5e2bb59b9f9ab86c9", 5958},
 		{"resource.000", 0, "6178ad2e83e58e4671ca03315f7a6498", 5868042},
@@ -4539,7 +4539,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16	},
 
-	// Quest for Glory 3 - German DOS (supplied by markcoolio in bug report #2723846)
+	// Quest for Glory 3 - German DOS (supplied by markcoolio in bug report #4278)
 	// Executable scanning reports "L.rry.083"
 	{"qfg3", "", {
 		{"resource.map", 0, "19e2bf9b693932b5e2bb59b9f9ab86c9", 5958},
@@ -4547,7 +4547,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::DE_DEU, Common::kPlatformDOS, 0, GUIO_STD16	},
 
-	// Quest for Glory 3 - French DOS v1.1 (supplied by misterhands in bug report #3586214)
+	// Quest for Glory 3 - French DOS v1.1 (supplied by misterhands in bug report #6182)
 	// Executable scanning reports "L.rry.083"
 	{"qfg3", "", {
 		{"resource.map", 0, "19e2bf9b693932b5e2bb59b9f9ab86c9", 5958},
@@ -4566,7 +4566,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		Common::ES_ESP, Common::kPlatformDOS, 0, GUIO_STD16_SPEECH	},
 
 	// Quest for Glory 3 - Italian DOS
-	// Supplied by ghoost in bug report #3053457
+	// Supplied by ghoost in bug report #5310
 	{"qfg3", "", {
 		{"resource.map", 0, "19e2bf9b693932b5e2bb59b9f9ab86c9", 5958},
 		{"resource.000", 0, "6178ad2e83e58e4671ca03315f7a6498", 5868000},
@@ -4598,7 +4598,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
                                GAMEOPTION_ORIGINAL_SAVELOAD, \
                                GAMEOPTION_HQ_VIDEO)
 
-	// Quest for Glory 4 1.1 Floppy - English DOS (supplied by markcool in bug report #2723852)
+	// Quest for Glory 4 1.1 Floppy - English DOS (supplied by markcool in bug report #4280)
 	// SCI interpreter version 2.000.000 (a guess?)
 	{"qfg4", "", {
 		{"resource.map", 0, "685bdb1ed47bbbb0e5e25db392da83ce", 9301},
@@ -4606,7 +4606,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO_QFG4_FLOPPY },
 
-	// Quest for Glory 4 1.1 Floppy - English DOS (supplied by abevi in bug report #2612718)
+	// Quest for Glory 4 1.1 Floppy - English DOS (supplied by abevi in bug report #4176)
 	// SCI interpreter version 2.000.000
 	{"qfg4", "", {
 		{"resource.map", 0, "d10a4cc177d2091d744e2ad8c049b0ae", 9295},
@@ -4614,7 +4614,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO_QFG4_FLOPPY },
 
-	// Quest for Glory 4 1.1 Floppy - German DOS (supplied by markcool in bug report #2723850)
+	// Quest for Glory 4 1.1 Floppy - German DOS (supplied by markcool in bug report #4279)
 	// Executable scanning reports "2.000.000", VERSION file reports "1.1"
 	{"qfg4", "", {
 		{"resource.map", 0, "9e0abba8746f40565bc7eb5720522ecd", 9301},
@@ -4677,7 +4677,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO_RAMA },
 
-	// RAMA - English DOS/Windows (from Quietust, in bug report #2850645)
+	// RAMA - English DOS/Windows (from Quietust, in bug report #4583)
 	{"rama", "", {
 		{"resmap.001", 0, "4a2f3dd87f8033dc0deac43e820cc1ca", 8338},
 		{"ressci.001", 0, "2a68edd064e5e4937b5e9c74b38f2082", 70599164},
@@ -4941,7 +4941,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		Common::ES_ESP, Common::kPlatformDOS, 0, GUIO_STD16	},
 
 	// Space Quest I 2.0 EGA DOS (6 x 3.5" disks)
-	// Provided by ssburnout in bug report #3046805
+	// Provided by ssburnout in bug report #5258
 	{"sq1sci", "SCI/EGA", {
 		{"resource.map", 0, "dc1bb935bf32da652b2e687617f50cd4", 6003},
 		{"resource.000", 0, "e9d866534f8c84de82e25f2631ff258c", 409145},
@@ -4997,7 +4997,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, ADGF_DEMO, GUIO_STD16_PALETTEMODS	},
 
-	// Space Quest 3 - English DOS (provided by richiefs in bug report #2670691)
+	// Space Quest 3 - English DOS (provided by richiefs in bug report #4214)
 	// SCI interpreter version 0.000.453
 	{"sq3", "", {
 		{"resource.map", 0, "fee82d211c3918a90ce3b476d3dbb245", 5484},
@@ -5066,7 +5066,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16_PALETTEMODS	},
 
-	// Space Quest 3 - English DOS (from abevi, bug report #2612718)
+	// Space Quest 3 - English DOS (from abevi, bug report #4176)
 	{"sq3", "", {
 		{"resource.map", 0, "eca165515c6b62b05fa86b7d8f727660", 5598},
 		{"resource.001", 0, "ceeda7202b96e5c85ecaa88a40a540fc", 170494},
@@ -5101,7 +5101,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::DE_DEU, Common::kPlatformDOS, ADGF_ADDENGLISH, GUIO_STD16_MAC_PALETTEMODS },
 
-	// Space Quest 3 v1.052 - German DOS (supplied by markcoolio in bug report #2723860, also includes english language)
+	// Space Quest 3 v1.052 - German DOS (supplied by markcoolio in bug report #4281, also includes english language)
 	// Executable scanning reports "S.old.114"
 	{"sq3", "", {
 		{"resource.map", 0, "f0dd735098c254f584878649c6f08dbc", 5154},
@@ -5182,7 +5182,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16	},
 
-	// Space Quest 4 1.052 - English DOS Floppy (supplied by markcoolio in bug report #2723865)
+	// Space Quest 4 1.052 - English DOS Floppy (supplied by markcoolio in bug report #4283)
 	// Also matches floppies labeled "VER#1.1 INT#4.29.91" (tsoliman)
 	// Executable scanning reports "1.000.753"
 	// SCI interpreter version 1.000.200 (just a guess)
@@ -5197,7 +5197,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16	},
 
-	// Space Quest 4 1.000 - French DOS Floppy (supplied by misterhands in bug report #3515247)
+	// Space Quest 4 1.000 - French DOS Floppy (supplied by misterhands in bug report #6019)
 	{"sq4", "", {
 
 		{"resource.map", 0, "1fd6f356f6a59ad2057686ce6573caeb", 6159},
@@ -5210,7 +5210,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::FR_FRA, Common::kPlatformDOS, 0, GUIO_STD16	},
 
-	// Space Quest 4 1.000 - English DOS Floppy (from abevi, bug report #2612718)
+	// Space Quest 4 1.000 - English DOS Floppy (from abevi, bug report #4176)
 	{"sq4", "", {
 		{"resource.map", 0, "8f08b97ca093f370c56d99715b015554", 6153},
 		{"resource.000", 0, "5f6a1fff40584ee807efd547899b1ba5", 206032},
@@ -5223,7 +5223,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16	},
 
 	// Space Quest IV DOS 1.060 EGA (6 x 3.5" disks)
-	// Supplied by ssburnout in bug report #3046781
+	// Supplied by ssburnout in bug report #5255
 	{"sq4", "EGA", {
 		{"resource.map", 0, "4f59814d23a3721f251140fdcfebe35d", 5556},
 		{"resource.000", 0, "e1f46832cd2458796028e054a0466031", 385479},
@@ -5346,7 +5346,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::ES_ESP, Common::kPlatformDOS, ADGF_ADDENGLISH, GUIO_STD16	},
 
-	// Space Quest 4 1.000 - German DOS Floppy (supplied by markcoolio in bug report #2723862, also includes english language)
+	// Space Quest 4 1.000 - German DOS Floppy (supplied by markcoolio in bug report #4282, also includes english language)
 	// Executable scanning reports "1.SQ4.030"
 	// SCI interpreter version 1.000.200 (just a guess)
 	{"sq4", "", {
@@ -5409,7 +5409,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, ADGF_PIRATED, GUIO_STD16	},
 
-	// Space Quest 5 v1.04 - German DOS (from Tobis87, updated information by markcool from bug reports #2723935 and #2724762)
+	// Space Quest 5 v1.04 - German DOS (from Tobis87, updated information by markcool from bug reports #4285 and #4287)
 	// SCI interpreter version 1.001.068
 	{"sq5", "", {
 		{"resource.map", 0, "66317c12ac6e818d1f7c17e83c1d9819", 6143},
@@ -5434,7 +5434,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::IT_ITA, Common::kPlatformDOS, 0, GUIO_STD16	},
 
-	// Space Quest 5 - Spanish DOS Floppy (from mirir, bug report #3090664)
+	// Space Quest 5 - Spanish DOS Floppy (from mirir, bug report #5459)
 	{"sq5", "", {
 		{"resource.000", 0, "73748852548faa42927f7537b165582d", 6049994},
 		{"resource.map", 0, "5714a899033bdebf2d61ad333c8c6637", 6492},
@@ -5496,7 +5496,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::FR_FRA, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO_SQ6 },
 
-	// Space Quest 6 - German DOS (from Tobis87, updated info from markcoolio in bug report #2723884)
+	// Space Quest 6 - German DOS (from Tobis87, updated info from markcoolio in bug report #4284)
 	// SCI interpreter version 2.100.002 (just a guess)
 	{"sq6", "", {
 		{"resource.map", 0, "664d797415484f85c90b1b45aedc7686", 10534},
diff --git a/engines/sci/engine/kevent.cpp b/engines/sci/engine/kevent.cpp
index df0e94fb8d..b57b43ac96 100644
--- a/engines/sci/engine/kevent.cpp
+++ b/engines/sci/engine/kevent.cpp
@@ -267,9 +267,9 @@ reg_t kGetEvent(EngineState *s, int argc, reg_t *argv) {
 
 	// Wait a bit here, so that the CPU isn't maxed out when the game
 	// is waiting for user input (e.g. when showing text boxes) - bug
-	// #3037874. Make sure that we're not delaying while the game is
+	// #5091. Make sure that we're not delaying while the game is
 	// benchmarking, as that will affect the final benchmarked result -
-	// check bugs #3058865 and #3127824
+	// check bugs #5326 and #5543
 	if (s->_gameIsBenchmarking) {
 		// Game is benchmarking, don't add a delay
 	} else if (getSciVersion() < SCI_VERSION_2) {
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index d7ed5bf356..3865d30f24 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -60,7 +60,7 @@ namespace Sci {
 static int16 adjustGraphColor(int16 color) {
 	// WORKAROUND: EGA and Amiga games can set invalid colors (above 0 - 15).
 	// It seems only the lower nibble was used in these games.
-	// bug #3048908, #3486899.
+	// bug #5267, #5968.
 	// Confirmed in EGA games KQ4(late), QFG1(ega), LB1 that
 	// at least FillBox (only one of the functions using adjustGraphColor)
 	// behaves like this.
@@ -198,7 +198,7 @@ static reg_t kSetCursorSci11(EngineState *s, int argc, reg_t *argv) {
 		}
 		break;
 	case 10:
-		// Freddy pharkas, when using the whiskey glass to read the prescription (bug #3034973)
+		// Freddy pharkas, when using the whiskey glass to read the prescription (bug #4969)
 		g_sci->_gfxCursor->kernelSetZoomZone(argv[0].toUint16(),
 			Common::Rect(argv[1].toUint16(), argv[2].toUint16(), argv[3].toUint16(), argv[4].toUint16()),
 			argv[5].toUint16(), argv[6].toUint16(), argv[7].toUint16(),
@@ -368,7 +368,7 @@ reg_t kTextSize(EngineState *s, int argc, reg_t *argv) {
 	// its end. We trim the text here, otherwise the graphics code will
 	// attempt to draw a very large window (larger than the screen) to
 	// show the text, and crash.
-	// Fixes bug #3306417.
+	// Fixes bug #5710.
 	if (textWidth >= g_sci->_gfxScreen->getDisplayWidth() ||
 		textHeight >= g_sci->_gfxScreen->getDisplayHeight()) {
 		// TODO: Is this needed for SCI32 as well?
@@ -1178,7 +1178,7 @@ reg_t kAnimate(EngineState *s, int argc, reg_t *argv) {
 	// doesn't call kGetEvent(), so no events are processed (e.g. window
 	// focusing, window moving etc). We poll events for that scene, to
 	// keep ScummVM responsive. Fixes ScummVM "freezing" during the credits,
-	// bug #3101846
+	// bug #5494
 	if (g_sci->getGameId() == GID_ECOQUEST && s->currentRoomNumber() == 680)
 		g_sci->getEventManager()->getSciEvent(kSciEventPeek);
 
diff --git a/engines/sci/engine/klists.cpp b/engines/sci/engine/klists.cpp
index 9427b29475..ecd498f53a 100644
--- a/engines/sci/engine/klists.cpp
+++ b/engines/sci/engine/klists.cpp
@@ -43,7 +43,7 @@ static bool isSaneNodePointer(SegManager *segMan, reg_t addr) {
 				//  there is no previous entry so we get 0 in here
 			} else if ((g_sci->getGameId() == GID_HOYLE1) && (g_sci->getEngineState()->currentRoomNumber() == 3)) {
 				// HOYLE1: after sorting cards in hearts, in the next round
-				// we get an invalid node - bug #3038433
+				// we get an invalid node - bug #5109
 			} else {
 				error("isSaneNodePointer: Node at %04x:%04x wasn't found", PRINT_REG(addr));
 			}
diff --git a/engines/sci/engine/kmath.cpp b/engines/sci/engine/kmath.cpp
index ee5787af01..c93778fd1d 100644
--- a/engines/sci/engine/kmath.cpp
+++ b/engines/sci/engine/kmath.cpp
@@ -50,7 +50,7 @@ reg_t kRandom(EngineState *s, int argc, reg_t *argv) {
 		// to smallest). An example can be found in Longbow, room 710, where a
 		// random number is requested from 119 to 83. In this case, we're
 		// supposed to return toNumber (determined by the KQ5CD disasm).
-		// Fixes bug #3413020.
+		// Fixes bug #5846.
 		if (fromNumber > toNumber)
 			return make_reg(0, toNumber);
 
diff --git a/engines/sci/engine/kmenu.cpp b/engines/sci/engine/kmenu.cpp
index 5fcac0d31d..fc507dbb38 100644
--- a/engines/sci/engine/kmenu.cpp
+++ b/engines/sci/engine/kmenu.cpp
@@ -48,7 +48,7 @@ reg_t kSetMenu(EngineState *s, int argc, reg_t *argv) {
 
 	while (argPos < argc) {
 		attributeId = argv[argPos].toUint16();
-		// Happens in the fanmade game Cascade Quest when loading - bug #3038767
+		// Happens in the fanmade game Cascade Quest when loading - bug #5118
 		value = (argPos + 1 < argc) ? argv[argPos + 1] : NULL_REG;
 		g_sci->_gfxMenu->kernelSetAttribute(menuId, itemId, attributeId, value);
 		argPos += 2;
diff --git a/engines/sci/engine/kmisc.cpp b/engines/sci/engine/kmisc.cpp
index f4d3c0c283..a285ed75ba 100644
--- a/engines/sci/engine/kmisc.cpp
+++ b/engines/sci/engine/kmisc.cpp
@@ -81,7 +81,7 @@ reg_t kGameIsRestarting(EngineState *s, int argc, reg_t *argv) {
 		// low it is in the animate list. This worked somewhat in older PCs, but
 		// not in modern computers. We throttle the scene in order to allow the
 		// stones to display, otherwise the game scripts reset them too soon.
-		// Fixes bug #3127824.
+		// Fixes bug #5543.
 		if (s->currentRoomNumber() == 100) {
 			s->_throttleTrigger = true;
 			neededSleep = 60;
@@ -118,7 +118,7 @@ reg_t kGameIsRestarting(EngineState *s, int argc, reg_t *argv) {
 	case GID_SQ4:
 		// In SQ4 (floppy and CD) the sequel police appear way too quickly in
 		// the Skate-o-rama rooms, resulting in all sorts of timer issues, like
-		// #3109139 (which occurs because a police officer instantly teleports
+		// #5514 (which occurs because a police officer instantly teleports
 		// just before Roger exits and shoots him). We throttle these scenes a
 		// bit more, in order to prevent timer bugs related to the sequel police.
 		if (s->currentRoomNumber() == 405 || s->currentRoomNumber() == 406 ||
@@ -315,7 +315,7 @@ reg_t kMemory(EngineState *s, int argc, reg_t *argv) {
 		//     fit of course.
 		//  - lsl5 (multilingual) room 280
 		//     allocates memory according to a previous kStrLen for the name of
-		//     the airport ladies (bug #3093818), which isn't enough
+		//     the airport ladies (bug #5478), which isn't enough
 		byteCount += 2 + (byteCount & 1);
 
 		if (!s->_segMan->allocDynmem(byteCount, "kMemory() critical", &s->r_acc)) {
diff --git a/engines/sci/engine/kpathing.cpp b/engines/sci/engine/kpathing.cpp
index afa743b4b6..15f1705f84 100644
--- a/engines/sci/engine/kpathing.cpp
+++ b/engines/sci/engine/kpathing.cpp
@@ -1064,7 +1064,7 @@ static Common::Point *fixup_end_point(PathfindingState *s, const Common::Point &
 					// We shouldn't get here twice.
 					// Happens in LB2CD, inside the speakeasy when walking from the
 					// speakeasy (room 310) into the bathroom (room 320), after having
-					// consulted the notebook (bug #3036299).
+					// consulted the notebook (bug #5029).
 					// We need to break in this case, otherwise we'll end in an infinite
 					// loop.
 					warning("AvoidPath: end point is contained in multiple polygons");
@@ -1169,7 +1169,7 @@ static Polygon *convert_polygon(EngineState *s, reg_t polygon) {
 	SegmentRef pointList = segMan->dereference(points);
 	// Check if the target polygon is still valid. It may have been released
 	// in the meantime (e.g. in LSL6, room 700, when using the elevator).
-	// Refer to bug #3034501.
+	// Refer to bug #4946.
 	if (!pointList.isValid() || pointList.skipByte) {
 		warning("convert_polygon: Polygon data pointer is invalid, skipping polygon");
 		return NULL;
@@ -1254,7 +1254,7 @@ static PathfindingState *convert_polygon_set(EngineState *s, reg_t poly_list, Co
 
 		while (node) {
 			// The node value might be null, in which case there's no polygon to parse.
-			// Happens in LB2 floppy - refer to bug #3041232
+			// Happens in LB2 floppy - refer to bug #5195
 			polygon = !node->value.isNull() ? convert_polygon(s, node->value) : NULL;
 
 			if (polygon) {
diff --git a/engines/sci/engine/kscripts.cpp b/engines/sci/engine/kscripts.cpp
index 5c3369e2d4..2b03e13cdb 100644
--- a/engines/sci/engine/kscripts.cpp
+++ b/engines/sci/engine/kscripts.cpp
@@ -292,7 +292,7 @@ reg_t kScriptID(EngineState *s, int argc, reg_t *argv) {
 	// This is taken from the patch by NewRisingSun(NRS) / Belzorash. Global 3
 	// is used for timing during the intro, and in the problematic version it's
 	// initialized to 0, whereas it's 6 in other versions. Thus, we assign it
-	// to 6 here, fixing the speed of the introduction. Refer to bug #3102071.
+	// to 6 here, fixing the speed of the introduction. Refer to bug #5496.
 	if (g_sci->getGameId() == GID_PQ2 && script == 200 &&
 		s->variables[VAR_GLOBAL][kGlobalVarSpeed].isNull()) {
 		s->variables[VAR_GLOBAL][kGlobalVarSpeed] = make_reg(0, 6);
diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index a0631ca965..ffebf8a202 100644
--- a/engines/sci/engine/kstring.cpp
+++ b/engines/sci/engine/kstring.cpp
@@ -516,7 +516,7 @@ reg_t kMessage(EngineState *s, int argc, reg_t *argv) {
 	// never triggers the offending script code that corrupts the object.
 	// This only affects the jar of cabbage - any other object, including
 	// the empty jar has a different noun, thus it's unaffected.
-	// Fixes bug #3601090.
+	// Fixes bug #6232.
 	// NOTE: To fix a corrupted jar object, type "send Glass_Jar message 52"
 	// in the debugger.
 	if (g_sci->getGameId() == GID_PEPPER && func == 0 && argc >= 6 && module == 894 &&
diff --git a/engines/sci/engine/message.cpp b/engines/sci/engine/message.cpp
index f795b4bb3b..d07f20aebf 100644
--- a/engines/sci/engine/message.cpp
+++ b/engines/sci/engine/message.cpp
@@ -499,7 +499,7 @@ void MessageState::outputString(reg_t buf, const Common::String &str) {
 		} else {
 			// LSL6 sets an exit text here, but the buffer size allocated
 			// is too small. Don't display a warning in this case, as we
-			// don't use the exit text anyway - bug report #3035533
+			// don't use the exit text anyway - bug report #5000
 			if (g_sci->getGameId() == GID_LSL6 && str.hasPrefix("\r\n(c) 1993 Sierra On-Line, Inc")) {
 				// LSL6 buggy exit text, don't show warning
 			} else {
diff --git a/engines/sci/engine/object.cpp b/engines/sci/engine/object.cpp
index f3bd1292bd..5630ef249c 100644
--- a/engines/sci/engine/object.cpp
+++ b/engines/sci/engine/object.cpp
@@ -278,10 +278,10 @@ bool Object::initBaseObject(SegManager *segMan, reg_t addr, bool doInitSuperClas
 
 		if (_variables.size() != originalVarCount) {
 			// These objects are probably broken.
-			// An example is 'witchCage' in script 200 in KQ5 (#3034714),
+			// An example is 'witchCage' in script 200 in KQ5 (#4964),
 			// but also 'girl' in script 216 and 'door' in script 22.
 			// In LSL3 a number of sound objects trigger this right away.
-			// SQ4-floppy's bug #3037938 also seems related.
+			// SQ4-floppy's bug #5093 also seems related.
 
 			// The effect is that a number of its method selectors may be
 			// treated as variable selectors, causing unpredictable effects.
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 38992bdd68..070efdbd9a 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -839,7 +839,7 @@ void GfxPalette::saveLoadWithSerializer(Common::Serializer &s) {
 		// We need to save intensity of the _sysPalette at least for kq6 when entering the dark cave (room 390)
 		//  from room 340. scripts will set intensity to 60 for this room and restore them when leaving.
 		//  Sierra SCI is also doing this (although obviously not for SCI0->SCI01 games, still it doesn't hurt
-		//  to save it everywhere). Refer to bug #3072868
+		//  to save it everywhere). Refer to bug #5383
 		s.syncBytes(_sysPalette.intensity, 256);
 	}
 	if (s.getVersion() >= 24) {
diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp
index 989840e9d1..8955ab62fb 100644
--- a/engines/sci/engine/script.cpp
+++ b/engines/sci/engine/script.cpp
@@ -125,7 +125,7 @@ void Script::load(int script_nr, ResourceManager *resMan, ScriptPatcher *scriptP
 		// fit the string showing how many shots are left (a nasty script bug,
 		// corrupting heap memory). We add 10 more locals so that it has enough
 		// space to use as the target for its kFormat operation. Fixes bug
-		// #3059871.
+		// #5335.
 		extraLocalsWorkaround = 10;
 	}
 	bufSize += extraLocalsWorkaround * 2;
@@ -154,7 +154,7 @@ void Script::load(int script_nr, ResourceManager *resMan, ScriptPatcher *scriptP
 		// Some buggy game scripts contain two export tables (e.g. script 912
 		// in Camelot and script 306 in KQ4); in these scripts, the first table
 		// is broken, so we ignore it and use the last one instead
-		// Fixes bugs #3039785 and #3037595.
+		// Fixes bugs #5151 and #5079.
 		SciSpan<const uint16> exportTable = findBlockSCI0(SCI_OBJ_EXPORTS, true).subspan<const uint16>(0);
 		if (exportTable) {
 			// The export table is after the block header (4 bytes / 2 uint16s)
@@ -1072,7 +1072,7 @@ void Script::initializeObjectsSci0(SegManager *segMan, SegmentId segmentId, bool
 	bool oldScriptHeader = (getSciVersion() == SCI_VERSION_0_EARLY);
 
 	// We need to make two passes, as the objects in the script might be in the
-	// wrong order (e.g. in the demo of Iceman) - refer to bug #3034713
+	// wrong order (e.g. in the demo of Iceman) - refer to bug #4963
 	for (int pass = 1; pass <= 2; pass++) {
 		SciSpan<const byte> seeker = _buf->subspan(oldScriptHeader ? 2 : 0);
 
@@ -1096,8 +1096,8 @@ void Script::initializeObjectsSci0(SegManager *segMan, SegmentId segmentId, bool
 							if ((_nr == 202 || _nr == 764) && g_sci->getGameId() == GID_KQ5) {
 								// WORKAROUND: Script 202 of KQ5 French and German
 								// (perhaps Spanish too?) has an invalid object.
-								// This is non-fatal. Refer to bugs #3035396 and
-								// #3150767.
+								// This is non-fatal. Refer to bugs #4996 and
+								// #5568.
 								// Same happens with script 764, it seems to
 								// contain junk towards its end.
 								_objects.erase(addr.toUint16() - SCRIPT_OBJECT_MAGIC_OFFSET);
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp
index 99ba2ae177..a70d52e7a0 100644
--- a/engines/sci/engine/vm.cpp
+++ b/engines/sci/engine/vm.cpp
@@ -46,7 +46,7 @@ const reg_t SIGNAL_REG = {0, SIGNAL_OFFSET};
 const reg_t TRUE_REG = {0, 1};
 // Enable the define below to have the VM abort on cases where a conditional
 // statement is followed by an unconditional jump (which will most likely lead
-// to an infinite loop). Aids in detecting script bugs such as #3040722.
+// to an infinite loop). Aids in detecting script bugs such as #5172.
 //#define ABORT_ON_INFINITE_LOOP
 
 // validation functionality
@@ -531,7 +531,7 @@ int readPMachineInstruction(const byte *src, byte &extOpcode, int16 opparams[4])
 		// heuristic fail and leads to endless loops and crashes. Our
 		// interpretation of this seems correct, as other SCI tools, like for
 		// example SCI Viewer, have issues with these scripts (e.g. script 999
-		// in Circus Quest). Fixes bug #3038686.
+		// in Circus Quest). Fixes bug #5113.
 		if (!(extOpcode & 1) || g_sci->getGameId() == GID_FANMADE) {
 			// op_pushSelf: no adjustment necessary
 		} else {
@@ -1285,7 +1285,7 @@ void run_vm(EngineState *s) {
 			// heuristic fail and leads to endless loops and crashes. Our
 			// interpretation of this seems correct, as other SCI tools, like for
 			// example SCI Viewer, have issues with these scripts (e.g. script 999
-			// in Circus Quest). Fixes bug #3038686.
+			// in Circus Quest). Fixes bug #5113.
 			if (!(extOpcode & 1) || g_sci->getGameId() == GID_FANMADE) {
 				PUSH32(s->xs->objp);
 			} else {
diff --git a/engines/sci/graphics/compare.cpp b/engines/sci/graphics/compare.cpp
index 736f0093a8..41578e3d76 100644
--- a/engines/sci/graphics/compare.cpp
+++ b/engines/sci/graphics/compare.cpp
@@ -87,7 +87,7 @@ reg_t GfxCompare::canBeHereCheckRectList(const reg_t checkObject, const Common::
 				// This behavior is slightly odd, but it's how the original SCI
 				// engine did it: a rect cannot be contained within itself
 				// (there is no equality). Do NOT change this to contains(), as
-				// it breaks KQ4 early (bug #3315639).
+				// it breaks KQ4 early (bug #5755).
 				if (curRect.right > checkRect.left &&
 					curRect.left < checkRect.right &&
 					curRect.bottom > checkRect.top &&
diff --git a/engines/sci/graphics/cursor.cpp b/engines/sci/graphics/cursor.cpp
index a0a5636c83..095f7e34dd 100644
--- a/engines/sci/graphics/cursor.cpp
+++ b/engines/sci/graphics/cursor.cpp
@@ -138,10 +138,10 @@ void GfxCursor::kernelSetShape(GuiResourceId resourceId) {
 	colorMapping[2] = SCI_CURSOR_SCI0_TRANSPARENCYCOLOR;
 	colorMapping[3] = _palette->matchColor(170, 170, 170) & SCI_PALETTE_MATCH_COLORMASK; // Grey
 	// TODO: Figure out if the grey color is hardcoded
-	// HACK for the magnifier cursor in LB1, fixes its color (bug #3487092)
+	// HACK for the magnifier cursor in LB1, fixes its color (bug #5971)
 	if (g_sci->getGameId() == GID_LAURABOW && resourceId == 1)
 		colorMapping[3] = _screen->getColorWhite();
-	// HACK for Longbow cursors, fixes the shade of grey they're using (bug #3489101)
+	// HACK for Longbow cursors, fixes the shade of grey they're using (bug #5983)
 	if (g_sci->getGameId() == GID_LONGBOW)
 		colorMapping[3] = _palette->matchColor(223, 223, 223) & SCI_PALETTE_MATCH_COLORMASK; // Light Grey
 
diff --git a/engines/sci/graphics/menu.cpp b/engines/sci/graphics/menu.cpp
index 4503145db7..45f0ba3402 100644
--- a/engines/sci/graphics/menu.cpp
+++ b/engines/sci/graphics/menu.cpp
@@ -288,7 +288,7 @@ void GfxMenu::kernelSetAttribute(uint16 menuId, uint16 itemId, uint16 attributeI
 	GuiMenuItemEntry *itemEntry = findItem(menuId, itemId);
 
 	if (!itemEntry) {
-		// PQ2 demo calls this, for example, but has no menus (bug report #3034507). Some SCI
+		// PQ2 demo calls this, for example, but has no menus (bug report #4948). Some SCI
 		// fan games (Al Pond 2, Aquarius) call this too on non-existent menu items. The
 		// original interpreter ignored these as well.
 		debugC(kDebugLevelGraphics, "Tried to setAttribute() on non-existent menu-item %d:%d", menuId, itemId);
diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index 89766e2443..841895203a 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -740,7 +740,7 @@ bool GfxPalette::palVaryLoadTargetPalette(GuiResourceId resourceId) {
 void GfxPalette::palVaryInstallTimer() {
 	// Remove any possible leftover palVary timer callbacks.
 	// This happens for example in QFG1VGA, when sleeping at Erana's place
-	// (bug #3439240) - the nighttime to daytime effect clashes with the
+	// (bug #5900) - the nighttime to daytime effect clashes with the
 	// scene transition effect, as we load scene images too quickly for
 	// the SCI scripts in that case (also refer to kernelPalVaryInit).
 	palVaryRemoveTimer();
diff --git a/engines/sci/graphics/picture.cpp b/engines/sci/graphics/picture.cpp
index 6ff659ec2f..86fe891f39 100644
--- a/engines/sci/graphics/picture.cpp
+++ b/engines/sci/graphics/picture.cpp
@@ -144,7 +144,7 @@ void GfxPicture::drawCelData(const SciSpan<const byte> &inbuffer, int headerPos,
 	const SciSpan<const byte> headerPtr = inbuffer.subspan(headerPos);
 	const SciSpan<const byte> rlePtr = inbuffer.subspan(rlePos);
 	// displaceX, displaceY fields are ignored, and may contain garbage
-	// (e.g. pic 261 in Dr. Brain 1 Spanish - bug #3614914)
+	// (e.g. pic 261 in Dr. Brain 1 Spanish - bug #6388)
 	//int16 displaceX, displaceY;
 	byte priority = _priority;
 	byte clearColor;
diff --git a/engines/sci/graphics/ports.cpp b/engines/sci/graphics/ports.cpp
index eb66896b53..bc813c27bd 100644
--- a/engines/sci/graphics/ports.cpp
+++ b/engines/sci/graphics/ports.cpp
@@ -304,7 +304,7 @@ Window *GfxPorts::addWindow(const Common::Rect &dims, const Common::Rect *restor
 
 	// KQ1sci, KQ4, iceman, QfG2 always add windows to the back of the list.
 	// KQ5CD checks style.
-	// Hoyle3-demo also always adds to the back (#3036763).
+	// Hoyle3-demo also always adds to the back (#5040).
 	bool forceToBack = (getSciVersion() <= SCI_VERSION_1_EGA_ONLY) ||
 	                   (g_sci->getGameId() == GID_HOYLE3 && g_sci->isDemo());
 
@@ -394,7 +394,7 @@ Window *GfxPorts::addWindow(const Common::Rect &dims, const Common::Rect *restor
 	// invasive changes than this one, thus it's not really worth the effort
 	// for a feature that was not present in the original game, and its
 	// implementation is buggy in the first place.
-	// Adjusting the restore rect properly fixes bug #3575276.
+	// Adjusting the restore rect properly fixes bug #6154.
 
 	if (wmprect.top > pwnd->dims.top) {
 		pwnd->dims.moveTo(pwnd->dims.left, wmprect.top);
diff --git a/engines/sci/graphics/view.cpp b/engines/sci/graphics/view.cpp
index ab44dc5c4f..095804e13c 100644
--- a/engines/sci/graphics/view.cpp
+++ b/engines/sci/graphics/view.cpp
@@ -214,7 +214,7 @@ void GfxView::initData(GuiResourceId resourceId) {
 				// HACK: Fix Ego's odd displacement in the QFG3 demo, scene 740.
 				// For some reason, ego jumps above the rope, so we fix his rope
 				// hanging view by displacing it down by 40 pixels. Fixes bug
-				// #3035693.
+				// #5009.
 				// FIXME: Remove this once we figure out why Ego jumps so high.
 				// Likely culprits include kInitBresen, kDoBresen and kCantBeHere.
 				// The scripts have the y offset that hero reaches (11) hardcoded,
@@ -584,7 +584,7 @@ void unpackCelData(const SciSpan<const byte> &inBuffer, SciSpan<byte> &celBitmap
 			runLength = curByte & 0x3F;
 
 			switch (curByte & 0xC0) {
-			case 0x40: // copy bytes as is (In copy case, runLength can go up to 127 i.e. pixel & 0x40). Fixes bug #3135872.
+			case 0x40: // copy bytes as is (In copy case, runLength can go up to 127 i.e. pixel & 0x40). Fixes bug #5551.
 				runLength += 64;
 				// fall through
 			case 0x00: // copy bytes as-is
diff --git a/engines/sci/resource/resource.cpp b/engines/sci/resource/resource.cpp
index 48a1fc6d24..816505e4fd 100644
--- a/engines/sci/resource/resource.cpp
+++ b/engines/sci/resource/resource.cpp
@@ -2004,7 +2004,7 @@ int ResourceManager::readResourceMapSCI1(ResourceSource *map) {
 			} else {
 				// If the resource is already present in a volume, change it to
 				// the new content (but only in a volume, so as not to overwrite
-				// external patches - refer to bug #3366295).
+				// external patches - refer to bug #5796).
 				// This is needed at least for the German version of Pharkas.
 				// That version contains several duplicate resources INSIDE the
 				// resource data files like fonts, views, scripts, etc. Thus,
diff --git a/engines/sci/sound/drivers/midi.cpp b/engines/sci/sound/drivers/midi.cpp
index 4cb1fed8ea..2a90f252d4 100644
--- a/engines/sci/sound/drivers/midi.cpp
+++ b/engines/sci/sound/drivers/midi.cpp
@@ -703,7 +703,7 @@ void MidiPlayer_Midi::readMt32Patch(const SciSpan<const byte> &data) {
 	// Skip reverb SysEx message
 	stream.seek(11, SEEK_CUR);
 
-	// Read reverb data (stored vertically - patch #3117434)
+	// Read reverb data (stored vertically - trac #9261)
 	for (int j = 0; j < 3; ++j) {
 		for (int i = 0; i < kReverbConfigNr; i++) {
 			_reverbConfig[i][j] = stream.readByte();
@@ -871,7 +871,7 @@ void MidiPlayer_Midi::readMt32DrvData() {
 			// Skip reverb SysEx message
 			f.skip(11);
 
-			// Read reverb data (stored vertically - patch #3117434)
+			// Read reverb data (stored vertically - trac #9261)
 			for (int j = 0; j < 3; ++j) {
 				for (int i = 0; i < kReverbConfigNr; i++) {
 					_reverbConfig[i][j] = f.readByte();
diff --git a/engines/sci/sound/midiparser_sci.cpp b/engines/sci/sound/midiparser_sci.cpp
index 38e7643bab..5c5d9bf168 100644
--- a/engines/sci/sound/midiparser_sci.cpp
+++ b/engines/sci/sound/midiparser_sci.cpp
@@ -378,7 +378,7 @@ end:
 	*outData++ = 0x00;
 
 	// This occurs in the music tracks of LB1 Amiga, when using the MT-32
-	// driver (bug #3297881)
+	// driver (bug #5692)
 	if (!containsMidiData)
 		warning("MIDI parser: the requested SCI0 sound has no MIDI note data for the currently selected sound driver");
 }
@@ -686,7 +686,7 @@ bool MidiParser_SCI::processEvent(const EventInfo &info, bool fireEvents) {
 				// SCI1 and newer games. Signalling is done differently in SCI0
 				// though, so ignoring these signals in SCI0 games will result
 				// in glitches (e.g. the intro of LB1 Amiga gets stuck - bug
-				// #3297883). Refer to MusicEntry::setSignal() in sound/music.cpp.
+				// #5693). Refer to MusicEntry::setSignal() in sound/music.cpp.
 				// FIXME: SSCI doesn't start playing at the very beginning
 				// of the stream, but at a fixed location a few commands later.
 				// That is probably why this signal isn't triggered
@@ -823,7 +823,7 @@ bool MidiParser_SCI::processEvent(const EventInfo &info, bool fireEvents) {
 			// QFG3 abuses the hold flag. Its scripts call kDoSoundSetHold,
 			// but sometimes there's no hold marker in the associated songs
 			// (e.g. song 110, during the intro). The original interpreter
-			// treats this case as an infinite loop (bug #3311911).
+			// treats this case as an infinite loop (bug #5744).
 			if (_pSnd->loop || _pSnd->hold > 0) {
 				jumpToTick(_loopTick);
 
@@ -897,7 +897,7 @@ void MidiParser_SCI::allNotesOff() {
 	for (i = 0; i < 16; ++i) {
 		if (_channelRemap[i] != -1) {
 			sendToDriver(0xB0 | i, 0x7b, 0); // All notes off
-			sendToDriver(0xB0 | i, 0x40, 0); // Also send a sustain off event (bug #3116608)
+			sendToDriver(0xB0 | i, 0x40, 0); // Also send a sustain off event (bug #5524)
 		}
 	}
 
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index a3af278401..b8ad9daef1 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -602,7 +602,7 @@ void SciMusic::soundPlay(MusicEntry *pSnd, bool restoring) {
 			// otherwise the song may keep looping forever when it ends in jumpToTick.
 			// This is needed when loading saved games, or when a game
 			// stops the same sound twice (e.g. LSL3 Amiga, going left from
-			// room 210 to talk with Kalalau). Fixes bugs #3083151 and #3106107.
+			// room 210 to talk with Kalalau). Fixes bugs #5404 and #5503.
 			uint16 prevLoop = pSnd->loop;
 			int16 prevHold = pSnd->hold;
 			pSnd->loop = 0;
@@ -742,7 +742,7 @@ void SciMusic::soundKill(MusicEntry *pSnd) {
 void SciMusic::soundPause(MusicEntry *pSnd) {
 	// SCI seems not to be pausing samples played back by kDoSound at all
 	//  It only stops looping samples (actually doesn't loop them again before they are unpaused)
-	//  Examples: Space Quest 1 death by acid drops (pause is called even specifically for the sample, see bug #3038048)
+	//  Examples: Space Quest 1 death by acid drops (pause is called even specifically for the sample, see bug #5097)
 	//             Eco Quest 1 during the intro when going to the abort-menu
 	//             In both cases sierra sci keeps playing
 	//            Leisure Suit Larry 1 doll scene - it seems that pausing here actually just stops
@@ -1001,7 +1001,7 @@ void MusicEntry::setSignal(int newSignal) {
 	// For SCI0, we cache the signals to set, as some songs might
 	// update their signal faster than kGetEvent is called (which is where
 	// we manually invoke kDoSoundUpdateCues for SCI0 games). SCI01 and
-	// newer handle signalling inside kDoSoundUpdateCues. Refer to bug #3042981
+	// newer handle signalling inside kDoSoundUpdateCues. Refer to bug #5218
 	if (g_sci->_features->detectDoSoundType() <= SCI_VERSION_0_LATE) {
 		if (!signal) {
 			signal = newSignal;
@@ -1011,7 +1011,7 @@ void MusicEntry::setSignal(int newSignal) {
 		}
 	} else {
 		// Set the signal directly for newer games, otherwise the sound
-		// object might be deleted already later on (refer to bug #3045913)
+		// object might be deleted already later on (refer to bug #5243)
 		signal = newSignal;
 	}
 }
diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index f8db23180e..ebd61b481a 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -70,7 +70,7 @@ int SoundCommandParser::getSoundResourceId(reg_t obj) {
 	if (g_sci && g_sci->_features->useAltWinGMSound()) {
 		// Check if the alternate MIDI song actually exists...
 		// There are cases where it just doesn't exist (e.g. SQ4, room 530 -
-		// bug #3392767). In these cases, use the DOS tracks instead.
+		// bug #5829). In these cases, use the DOS tracks instead.
 		if (resourceId && _resMan->testResource(ResourceId(kResourceTypeSound, resourceId + 1000)))
 			resourceId += 1000;
 	}
@@ -181,7 +181,7 @@ void SoundCommandParser::processPlaySound(reg_t obj, bool playBed, bool restorin
 		warning("kDoSound(play): Slot not found (%04x:%04x), initializing it manually", PRINT_REG(obj));
 		// The sound hasn't been initialized for some reason, so initialize it
 		// here. Happens in KQ6, room 460, when giving the creature (child) to
-		// the bookworm. Fixes bugs #3413301 and #3421098.
+		// the bookworm. Fixes bugs #5849 and #5868.
 		processInitSound(obj);
 		musicSlot = _music->getSlot(obj);
 		if (!musicSlot)
@@ -229,7 +229,7 @@ void SoundCommandParser::processPlaySound(reg_t obj, bool playBed, bool restorin
 	}
 
 	// Reset hold when starting a new song. kDoSoundSetHold is always called after
-	// kDoSoundPlay to set it properly, if needed. Fixes bug #3413589.
+	// kDoSoundPlay to set it properly, if needed. Fixes bug #5851.
 	musicSlot->hold = -1;
 	musicSlot->playBed = playBed;
 	if (_soundVersion >= SCI_VERSION_1_EARLY)
@@ -414,7 +414,7 @@ reg_t SoundCommandParser::kDoSoundFade(EngineState *s, int argc, reg_t *argv) {
 	reg_t obj = argv[0];
 
 	// The object can be null in several SCI0 games (e.g. Camelot, KQ1, KQ4, MUMG).
-	// Check bugs #3035149, #3036942 and #3578335.
+	// Check bugs #4984, #5045 and #6163.
 	// In this case, we just ignore the call.
 	if (obj.isNull() && argc == 1)
 		return s->r_acc;
@@ -602,7 +602,7 @@ void SoundCommandParser::processUpdateCues(reg_t obj) {
 		// We need signal for sci0 at least in iceman as well (room 14,
 		// fireworks).
 		// It is also needed in other games, e.g. LSL6 when talking to the
-		// receptionist (bug #3192166).
+		// receptionist (bug #5601).
 		// TODO: More thorougly check the different SCI version:
 		// * SCI1late sets signal to 0xFE here. (With signal 0xFF
 		//       duplicate music plays in LauraBow2CD - bug #6462)
@@ -644,7 +644,7 @@ void SoundCommandParser::processUpdateCues(reg_t obj) {
 reg_t SoundCommandParser::kDoSoundSendMidi(EngineState *s, int argc, reg_t *argv) {
 	// The 4 parameter variant of this call is used in at least LSL1VGA, room
 	// 110 (Lefty's bar), to distort the music when Larry is drunk and stands
-	// up - bug #3614447.
+	// up - bug #6349.
 	reg_t obj = argv[0];
 	byte channel = argv[1].toUint16() & 0xf;
 	byte midiCmd = (argc == 5) ? argv[2].toUint16() & 0xff : 0xB0;	// 0xB0: controller




More information about the Scummvm-git-logs mailing list