diff options
| author | Max Horn | 2006-04-08 08:43:28 +0000 |
|---|---|---|
| committer | Max Horn | 2006-04-08 08:43:28 +0000 |
| commit | 30c2e1345690cf537937bd3ba71d7d1874efe5cf (patch) | |
| tree | 0076a14f3f37758277cce7589f7daa925064fc9f /engines/scumm | |
| parent | 9c77c2ecd1beb3026df8249c5aed271616bc6449 (diff) | |
| download | scummvm-rg350-30c2e1345690cf537937bd3ba71d7d1874efe5cf.tar.gz scummvm-rg350-30c2e1345690cf537937bd3ba71d7d1874efe5cf.tar.bz2 scummvm-rg350-30c2e1345690cf537937bd3ba71d7d1874efe5cf.zip | |
Move some more bits into namespace Scumm
svn-id: r21685
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/plugin.cpp | 6 | ||||
| -rw-r--r-- | engines/scumm/plugin.h | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/engines/scumm/plugin.cpp b/engines/scumm/plugin.cpp index 1e3fc0abbc..2e57dcbbba 100644 --- a/engines/scumm/plugin.cpp +++ b/engines/scumm/plugin.cpp @@ -44,7 +44,7 @@ #endif -using namespace Scumm; +namespace Scumm { #pragma mark - #pragma mark --- Data types & constants --- @@ -838,12 +838,16 @@ int findSubstResFileName(SubstResFileNames &subst, const char *filename, int ind return -1; } +} // End of namespace Scumm #pragma mark - #pragma mark --- Plugin code --- #pragma mark - +using namespace Scumm; + + GameList Engine_SCUMM_gameIDList() { const PlainGameDescriptor *g = gameDescriptions; GameList games; diff --git a/engines/scumm/plugin.h b/engines/scumm/plugin.h index 59c30f5824..8dad3e3288 100644 --- a/engines/scumm/plugin.h +++ b/engines/scumm/plugin.h @@ -26,6 +26,8 @@ #include "common/util.h" +namespace Scumm { + /** * Descriptor of a specific SCUMM game. Used internally to store * information about the tons of game variants that exist. @@ -40,7 +42,6 @@ struct GameSettings { }; - enum GenMethods { kGenMac, kGenMacNoParens, @@ -55,8 +56,10 @@ struct SubstResFileNames { }; -extern bool applySubstResFileName(const SubstResFileNames &subst, const char *filename, char *buf, int bufsize); -extern int findSubstResFileName(SubstResFileNames &subst, const char *filename, int index); +bool applySubstResFileName(const SubstResFileNames &subst, const char *filename, char *buf, int bufsize); +int findSubstResFileName(SubstResFileNames &subst, const char *filename, int index); + +} // End of namespace Scumm #endif |