diff options
| author | lukaslw | 2014-10-28 21:36:25 +0100 |
|---|---|---|
| committer | lukaslw | 2014-10-28 21:36:25 +0100 |
| commit | 5f022f2e9e333318d38a456ce5db63b19e203b84 (patch) | |
| tree | 86613d412d81cf7e42f89f36e71bb57e79d7cc83 /engines | |
| parent | 9ad2135ff960da2bbc1882ac50f2188b5a9e228e (diff) | |
| download | scummvm-rg350-5f022f2e9e333318d38a456ce5db63b19e203b84.tar.gz scummvm-rg350-5f022f2e9e333318d38a456ce5db63b19e203b84.tar.bz2 scummvm-rg350-5f022f2e9e333318d38a456ce5db63b19e203b84.zip | |
PRINCE: Change PrinceGameType enum names
Fix compilation on gcc
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/prince/detection.h | 16 | ||||
| -rw-r--r-- | engines/prince/prince.cpp | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/engines/prince/detection.h b/engines/prince/detection.h index 6720e5e0b7..7e5bdd6b7b 100644 --- a/engines/prince/detection.h +++ b/engines/prince/detection.h @@ -29,9 +29,9 @@ namespace Prince { enum PrinceGameType { - UNK_DATA, - DE_DATA, - PL_DATA + kPrinceDataUNK, + kPrinceDataDE, + kPrinceDataPL }; struct PrinceGameDescription { @@ -55,7 +55,7 @@ static const PrinceGameDescription gameDescriptions[] = { ADGF_TESTING, GUIO1(GUIO_NONE) }, - DE_DATA + kPrinceDataDE }, { { @@ -67,7 +67,7 @@ static const PrinceGameDescription gameDescriptions[] = { ADGF_TESTING, GUIO1(GUIO_NONE) }, - PL_DATA + kPrinceDataPL }, { { @@ -79,7 +79,7 @@ static const PrinceGameDescription gameDescriptions[] = { ADGF_TESTING, GUIO1(GUIO_NONE) }, - DE_DATA + kPrinceDataDE }, { { @@ -91,9 +91,9 @@ static const PrinceGameDescription gameDescriptions[] = { ADGF_TESTING, GUIO1(GUIO_NONE) }, - PL_DATA + kPrinceDataPL }, - { AD_TABLE_END_MARKER, UNK_DATA } + { AD_TABLE_END_MARKER, kPrinceDataUNK } }; const static char *directoryGlobs[] = { diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp index a6197260e4..00e1736c46 100644 --- a/engines/prince/prince.cpp +++ b/engines/prince/prince.cpp @@ -506,11 +506,11 @@ bool PrinceEngine::loadLocation(uint16 locationNr) { loadMobPriority("mobpri"); _mobList.clear(); - if (getGameType() == PrinceGameType::DE_DATA) { + if (getGameType() == kPrinceDataDE) { const Common::String mobLstName = Common::String::format("mob%02d.lst", _locationNr); debug("name: %s", mobLstName.c_str()); Resource::loadResource(_mobList, mobLstName.c_str(), false); - } else if (getGameType() == PrinceGameType::PL_DATA) { + } else if (getGameType() == kPrinceDataPL) { Resource::loadResource(_mobList, "mob.lst", false); } if (getLanguage() != Common::PL_POL && getLanguage() != Common::DE_DEU) { |