Move some more bits into namespace Scumm

svn-id: r21685
This commit is contained in:
Max Horn 2006-04-08 08:43:28 +00:00
parent 9c77c2ecd1
commit 30c2e13456
2 changed files with 11 additions and 4 deletions

View File

@ -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;

View File

@ -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