aboutsummaryrefslogtreecommitdiff
path: root/engines/gob
diff options
context:
space:
mode:
authorJohannes Schickel2010-01-12 21:07:56 +0000
committerJohannes Schickel2010-01-12 21:07:56 +0000
commit0d995c592046aadbfcb8f46a252537da312912c5 (patch)
tree95a0a8d25372f887fe656f6ba61f050cc28845d4 /engines/gob
parent1ebe047972e2df513449db6aa615f6ab17dd6fb7 (diff)
downloadscummvm-rg350-0d995c592046aadbfcb8f46a252537da312912c5.tar.gz
scummvm-rg350-0d995c592046aadbfcb8f46a252537da312912c5.tar.bz2
scummvm-rg350-0d995c592046aadbfcb8f46a252537da312912c5.zip
Rename all "Adlib" uses to "AdLib" to match the real name of the sound card / company.
Check this for reference: http://en.wikipedia.org/wiki/Ad_Lib,_Inc. http://www.crossfire-designs.de/images/articles/soundcards/adlib.jpg (note the upper left of the card) This commit does not touch "adlib" and "ADLIB" uses! Also it does not update all the SCUMM detection entries, which still use "Adlib". svn-id: r47279
Diffstat (limited to 'engines/gob')
-rw-r--r--engines/gob/detection.cpp252
-rw-r--r--engines/gob/gob.cpp4
-rw-r--r--engines/gob/gob.h4
-rw-r--r--engines/gob/sound/adlib.cpp2
-rw-r--r--engines/gob/sound/sound.cpp22
-rw-r--r--engines/gob/sound/sound.h2
6 files changed, 143 insertions, 143 deletions
diff --git a/engines/gob/detection.cpp b/engines/gob/detection.cpp
index 29efe510fa..a6df9d2cd8 100644
--- a/engines/gob/detection.cpp
+++ b/engines/gob/detection.cpp
@@ -147,7 +147,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // CD 1.000 version.
@@ -427,7 +427,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by paul66 in bug report #1652352
@@ -441,7 +441,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by paul66 in bug report #1652352
@@ -455,7 +455,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by paul66 in bug report #1652352
@@ -469,7 +469,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by paul66 in bug report #1652352
@@ -483,7 +483,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by Hkz on #scummvm
@@ -501,7 +501,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by Hkz on #scummvm
@@ -519,7 +519,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by Hkz on #scummvm
@@ -537,7 +537,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by Hkz on #scummvm
@@ -555,7 +555,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by Hkz on #scummvm
@@ -573,7 +573,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -591,7 +591,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -609,7 +609,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -627,7 +627,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -645,7 +645,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -663,7 +663,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Found in Found in french ADI 2.5 Anglais Multimedia 5e
@@ -677,7 +677,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Found in Found in french ADI 2.5 Anglais Multimedia 5e
@@ -691,7 +691,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Found in Found in french ADI 2.5 Anglais Multimedia 5e
@@ -705,7 +705,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Found in Found in french ADI 2.5 Anglais Multimedia 5e
@@ -719,7 +719,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Found in Found in french ADI 2.5 Anglais Multimedia 5e
@@ -733,7 +733,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -747,7 +747,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob1,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, "AVT003.TOT", 0
},
{ // Supplied by fac76 in bug report #1883808
@@ -821,7 +821,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by koalet in bug report #2478585
@@ -839,7 +839,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -853,7 +853,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -867,7 +867,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by raziel_ in bug report #1891867
@@ -881,7 +881,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -895,7 +895,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by blackwhiteeagle in bug report #1605235
@@ -909,7 +909,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -923,7 +923,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by goodoldgeorg in bug report #2602017
@@ -937,7 +937,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -951,7 +951,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by arcepi in bug report #1659884
@@ -965,7 +965,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -1133,7 +1133,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, "usa.tot", 0
},
{
@@ -1147,7 +1147,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -1193,7 +1193,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -1211,7 +1211,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -1229,7 +1229,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -1247,7 +1247,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -1265,7 +1265,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -1283,7 +1283,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Found in french ADI 2 Francais-Maths CM1
@@ -1297,7 +1297,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Found in french ADI 2.5 Anglais Multimedia 5e
@@ -1311,7 +1311,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by vampir_raziel in bug report #1658373
@@ -1435,7 +1435,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeWeen,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -1449,7 +1449,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeWeen,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by cybot_tmin in bug report #1667743
@@ -1463,7 +1463,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeWeen,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -1477,7 +1477,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeWeen,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by cartman_ on #scummvm
@@ -1491,7 +1491,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeWeen,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by glorfindel in bugreport #1722142
@@ -1505,7 +1505,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeWeen,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -1519,7 +1519,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeWeen,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, "show.tot", 0
},
{
@@ -1533,7 +1533,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeWeen,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, "show.tot", 0
},
{
@@ -1645,7 +1645,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib | kFeaturesEGA,
+ kFeaturesAdLib | kFeaturesEGA,
0, 0, 0
},
{
@@ -1659,7 +1659,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib | kFeaturesEGA,
+ kFeaturesAdLib | kFeaturesEGA,
0, 0, 0
},
{
@@ -1673,7 +1673,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib | kFeaturesEGA,
+ kFeaturesAdLib | kFeaturesEGA,
0, 0, 0
},
{
@@ -1687,7 +1687,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib | kFeaturesEGA,
+ kFeaturesAdLib | kFeaturesEGA,
0, 0, 0
},
{
@@ -1701,7 +1701,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib | kFeaturesEGA,
+ kFeaturesAdLib | kFeaturesEGA,
0, 0, 0
},
{
@@ -1733,7 +1733,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib | kFeaturesEGA,
+ kFeaturesAdLib | kFeaturesEGA,
0, 0, 0
},
{
@@ -1747,7 +1747,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib | kFeaturesEGA,
+ kFeaturesAdLib | kFeaturesEGA,
0, 0, 0
},
{
@@ -1761,7 +1761,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib | kFeaturesEGA,
+ kFeaturesAdLib | kFeaturesEGA,
0, 0, 0
},
{
@@ -1775,7 +1775,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib | kFeaturesEGA,
+ kFeaturesAdLib | kFeaturesEGA,
0, 0, 0
},
{
@@ -1789,7 +1789,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib | kFeaturesEGA,
+ kFeaturesAdLib | kFeaturesEGA,
0, 0, 0
},
{ // Found in french ADI 2 Francais-Maths CM1
@@ -1803,7 +1803,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib | kFeaturesEGA,
+ kFeaturesAdLib | kFeaturesEGA,
0, 0, 0
},
{ // Found in french ADI 2 Francais-Maths CM1
@@ -1817,7 +1817,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib | kFeaturesEGA,
+ kFeaturesAdLib | kFeaturesEGA,
0, 0, 0
},
{ // Found in french ADI 2 Francais-Maths CM1
@@ -1831,7 +1831,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib | kFeaturesEGA,
+ kFeaturesAdLib | kFeaturesEGA,
0, 0, 0
},
{ // Found in french ADI 2 Francais-Maths CM1
@@ -1845,7 +1845,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib | kFeaturesEGA,
+ kFeaturesAdLib | kFeaturesEGA,
0, 0, 0
},
{ // Found in french ADI 2 Francais-Maths CM1
@@ -1859,7 +1859,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib | kFeaturesEGA,
+ kFeaturesAdLib | kFeaturesEGA,
0, 0, 0
},
{
@@ -1873,7 +1873,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -1887,7 +1887,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -1901,7 +1901,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by cartman_ on #scummvm
@@ -1915,7 +1915,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by goodoldgeorg in bug report #2105220
@@ -1929,7 +1929,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by koalet in bug report #2479034
@@ -1947,7 +1947,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2129,7 +2129,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2143,7 +2143,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2157,7 +2157,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2171,7 +2171,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2185,7 +2185,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Found in french ADI 2.6 Francais-Maths 4e
@@ -2199,7 +2199,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2217,7 +2217,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2235,7 +2235,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2249,7 +2249,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2267,7 +2267,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2295,7 +2295,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeFascination,
- kFeaturesAdlib,
+ kFeaturesAdLib,
"disk0.stk", 0, 0
},
{
@@ -2309,7 +2309,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeFascination,
- kFeaturesAdlib,
+ kFeaturesAdLib,
"intro.stk", 0, 0
},
{ // Supplied by sanguine
@@ -2323,7 +2323,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeFascination,
- kFeaturesAdlib,
+ kFeaturesAdLib,
"disk0.stk", 0, 0
},
{ // Supplied by windlepoons in bug report #2809247
@@ -2337,7 +2337,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeFascination,
- kFeaturesAdlib,
+ kFeaturesAdLib,
"disk0.stk", 0, 0
},
{
@@ -2351,7 +2351,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeFascination,
- kFeaturesAdlib,
+ kFeaturesAdLib,
"disk0.stk", 0, 0
},
{
@@ -2449,7 +2449,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
"demo.stk", "demo.tot", 0
},
{
@@ -2463,7 +2463,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
"demo.stk", "demo.tot", 0
},
{
@@ -2477,7 +2477,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2491,7 +2491,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by raziel_ in bug report #1891869
@@ -2505,7 +2505,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2523,7 +2523,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2541,7 +2541,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2559,7 +2559,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by fac76 in bug report #1742716
@@ -2577,7 +2577,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2591,7 +2591,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by paul66 in bug report #1652352
@@ -2605,7 +2605,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2619,7 +2619,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by Paranoimia on #scummvm
@@ -2633,7 +2633,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2647,7 +2647,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2661,7 +2661,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Supplied by SiRoCs in bug report #2098621
@@ -2675,7 +2675,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2857,7 +2857,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2871,7 +2871,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2885,7 +2885,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2899,7 +2899,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2917,7 +2917,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2935,7 +2935,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -2953,7 +2953,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ // Found in Found in french ADI 2.5 Anglais Multimedia 5e
@@ -2967,7 +2967,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -3051,7 +3051,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeInca2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -3065,7 +3065,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeInca2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -3079,7 +3079,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeInca2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -3093,7 +3093,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeInca2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -3107,7 +3107,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeInca2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -3121,7 +3121,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeInca2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -3135,7 +3135,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeInca2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -3149,7 +3149,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeInca2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{
@@ -3176,7 +3176,7 @@ static const GOBGameDescription gameDescriptions[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeInca2,
- kFeaturesAdlib | kFeaturesBATDemo,
+ kFeaturesAdLib | kFeaturesBATDemo,
0, 0, 7
},
{
@@ -4654,7 +4654,7 @@ static const GOBGameDescription fallbackDescs[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ //3
@@ -4668,7 +4668,7 @@ static const GOBGameDescription fallbackDescs[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob2,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ //4
@@ -4710,7 +4710,7 @@ static const GOBGameDescription fallbackDescs[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeGob3,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ //7
@@ -4752,7 +4752,7 @@ static const GOBGameDescription fallbackDescs[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ //10
@@ -4766,7 +4766,7 @@ static const GOBGameDescription fallbackDescs[] = {
GUIO_NOSUBTITLES | GUIO_NOSPEECH
},
kGameTypeLostInTime,
- kFeaturesAdlib,
+ kFeaturesAdLib,
0, 0, 0
},
{ //11
@@ -4962,7 +4962,7 @@ static const GOBGameDescription fallbackDescs[] = {
GUIO_NONE
},
kGameTypeUrban,
- kFeaturesAdlib | kFeatures640 | kFeaturesSCNDemo,
+ kFeaturesAdLib | kFeatures640 | kFeaturesSCNDemo,
"", "", 8
}
};
diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp
index 600d7f8bf8..1b02c73194 100644
--- a/engines/gob/gob.cpp
+++ b/engines/gob/gob.cpp
@@ -207,8 +207,8 @@ bool GobEngine::is640() const {
return (_features & kFeatures640) != 0;
}
-bool GobEngine::hasAdlib() const {
- return (_features & kFeaturesAdlib) != 0;
+bool GobEngine::hasAdLib() const {
+ return (_features & kFeaturesAdLib) != 0;
}
bool GobEngine::isSCNDemo() const {
diff --git a/engines/gob/gob.h b/engines/gob/gob.h
index 9f9a0a054d..468e168f27 100644
--- a/engines/gob/gob.h
+++ b/engines/gob/gob.h
@@ -121,7 +121,7 @@ enum Features {
kFeaturesNone = 0,
kFeaturesCD = 1 << 0,
kFeaturesEGA = 1 << 1,
- kFeaturesAdlib = 1 << 2,
+ kFeaturesAdLib = 1 << 2,
kFeatures640 = 1 << 3,
kFeaturesSCNDemo = 1 << 4,
kFeaturesBATDemo = 1 << 5,
@@ -208,7 +208,7 @@ public:
bool isCD() const;
bool isEGA() const;
bool is640() const;
- bool hasAdlib() const;
+ bool hasAdLib() const;
bool isSCNDemo() const;
bool isBATDemo() const;
bool is800x600() const;
diff --git a/engines/gob/sound/adlib.cpp b/engines/gob/sound/adlib.cpp
index 7566a9f8c7..e3dff14ace 100644
--- a/engines/gob/sound/adlib.cpp
+++ b/engines/gob/sound/adlib.cpp
@@ -59,7 +59,7 @@ void AdLib::init() {
_rate = _mixer->getOutputRate();
- _opl = makeAdlibOPL(_rate);
+ _opl = makeAdLibOPL(_rate);
_first = true;
_ended = false;
diff --git a/engines/gob/sound/sound.cpp b/engines/gob/sound/sound.cpp
index 2d7ba02385..a0add6f0b6 100644
--- a/engines/gob/sound/sound.cpp
+++ b/engines/gob/sound/sound.cpp
@@ -51,7 +51,7 @@ Sound::Sound(GobEngine *vm) : _vm(vm) {
_cdrom = 0;
_bgatmos = 0;
- _hasAdLib = (!_vm->_noMusic && _vm->hasAdlib());
+ _hasAdLib = (!_vm->_noMusic && _vm->hasAdLib());
if (!_vm->_noMusic && (_vm->getPlatform() == Common::kPlatformAmiga)) {
_infogrames = new Infogrames(*_vm->_mixer);
@@ -130,13 +130,13 @@ bool Sound::sampleLoad(SoundDesc *sndDesc, SoundType type, const char *fileName,
return sndDesc->load(type, data, size);
}
-void Sound::sampleFree(SoundDesc *sndDesc, bool noteAdlib, int index) {
+void Sound::sampleFree(SoundDesc *sndDesc, bool noteAdLib, int index) {
if (!sndDesc || sndDesc->empty())
return;
if (sndDesc->getType() == SOUND_ADL) {
- if (noteAdlib) {
+ if (noteAdLib) {
if (_adlPlayer)
if ((index == -1) || (_adlPlayer->getIndex() == index))
_adlPlayer->stopPlay();
@@ -241,7 +241,7 @@ bool Sound::adlibLoadADL(const char *fileName) {
if (!_adlPlayer)
_adlPlayer = new ADLPlayer(*_vm->_mixer);
- debugC(1, kDebugSound, "Adlib: Loading ADL data (\"%s\")", fileName);
+ debugC(1, kDebugSound, "AdLib: Loading ADL data (\"%s\")", fileName);
return _adlPlayer->load(fileName);
}
@@ -253,7 +253,7 @@ bool Sound::adlibLoadADL(byte *data, uint32 size, int index) {
if (!_adlPlayer)
_adlPlayer = new ADLPlayer(*_vm->_mixer);
- debugC(1, kDebugSound, "Adlib: Loading ADL data (%d)", index);
+ debugC(1, kDebugSound, "AdLib: Loading ADL data (%d)", index);
return _adlPlayer->load(data, size, index);
}
@@ -262,7 +262,7 @@ void Sound::adlibUnload() {
if (!_hasAdLib)
return;
- debugC(1, kDebugSound, "Adlib: Unloading data");
+ debugC(1, kDebugSound, "AdLib: Unloading data");
if (_adlPlayer)
_adlPlayer->unload();
@@ -277,7 +277,7 @@ bool Sound::adlibLoadMDY(const char *fileName) {
if (!_mdyPlayer)
_mdyPlayer = new MDYPlayer(*_vm->_mixer);
- debugC(1, kDebugSound, "Adlib: Loading MDY data (\"%s\")", fileName);
+ debugC(1, kDebugSound, "AdLib: Loading MDY data (\"%s\")", fileName);
if (!_vm->_dataIO->existData(fileName)) {
warning("Can't open MDY file \"%s\"", fileName);
@@ -305,7 +305,7 @@ bool Sound::adlibLoadTBR(const char *fileName) {
return false;
}
- debugC(1, kDebugSound, "Adlib: Loading MDY instruments (\"%s\")", fileName);
+ debugC(1, kDebugSound, "AdLib: Loading MDY instruments (\"%s\")", fileName);
DataStream *stream = _vm->_dataIO->getDataStream(fileName);
@@ -326,7 +326,7 @@ void Sound::adlibPlayTrack(const char *trackname) {
if (_adlPlayer->isPlaying())
return;
- debugC(1, kDebugSound, "Adlib: Playing ADL track \"%s\"", trackname);
+ debugC(1, kDebugSound, "AdLib: Playing ADL track \"%s\"", trackname);
_adlPlayer->unload();
_adlPlayer->load(trackname);
@@ -370,7 +370,7 @@ void Sound::adlibPlay() {
if (!_hasAdLib)
return;
- debugC(1, kDebugSound, "Adlib: Starting playback");
+ debugC(1, kDebugSound, "AdLib: Starting playback");
if (_adlPlayer)
_adlPlayer->startPlay();
@@ -382,7 +382,7 @@ void Sound::adlibStop() {
if (!_hasAdLib)
return;
- debugC(1, kDebugSound, "Adlib: Stopping playback");
+ debugC(1, kDebugSound, "AdLib: Stopping playback");
if (_adlPlayer)
_adlPlayer->stopPlay();
diff --git a/engines/gob/sound/sound.h b/engines/gob/sound/sound.h
index 6f6c1d0469..516fed5c78 100644
--- a/engines/gob/sound/sound.h
+++ b/engines/gob/sound/sound.h
@@ -55,7 +55,7 @@ public:
int sampleGetNextFreeSlot() const;
bool sampleLoad(SoundDesc *sndDesc, SoundType type, const char *fileName, bool tryExist = true);
- void sampleFree(SoundDesc *sndDesc, bool noteAdlib = false, int index = -1);
+ void sampleFree(SoundDesc *sndDesc, bool noteAdLib = false, int index = -1);
// SoundBlaster