aboutsummaryrefslogtreecommitdiff
path: root/engines/m4/resource.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2010-11-03 09:44:03 +0000
committerPaul Gilbert2010-11-03 09:44:03 +0000
commit0ac1eb82c65e7f20f51f6337df5aa64e02a1af29 (patch)
treeb529306dc3c705ac77b63940ca7b6f1a2578e5f5 /engines/m4/resource.cpp
parente56a3747d236703633fa3bb885542b9ebefe64ff (diff)
downloadscummvm-rg350-0ac1eb82c65e7f20f51f6337df5aa64e02a1af29.tar.gz
scummvm-rg350-0ac1eb82c65e7f20f51f6337df5aa64e02a1af29.tar.bz2
scummvm-rg350-0ac1eb82c65e7f20f51f6337df5aa64e02a1af29.zip
M4: Changed debug calls to debugCN since they all have newlines
svn-id: r54047
Diffstat (limited to 'engines/m4/resource.cpp')
-rw-r--r--engines/m4/resource.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/engines/m4/resource.cpp b/engines/m4/resource.cpp
index cc8fc3b055..fd54d439a6 100644
--- a/engines/m4/resource.cpp
+++ b/engines/m4/resource.cpp
@@ -43,12 +43,12 @@ FileSystem::FileSystem(const char *hashFilename) {
hashFile.open(hashFilename);
if (!hashFile.isOpen()) {
- debug(kDebugCore, "FileSystem::FileSystem: error opening hash %s\n", hashFilename);
+ debugCN(kDebugCore, "FileSystem::FileSystem: error opening hash %s\n", hashFilename);
}
hashSize = hashFile.readUint32LE();
- //debug(kDebugCore, "FileSystem::FileSystem: hashSize = %d\n", hashSize);
+ //debugCN(kDebugCore, "FileSystem::FileSystem: hashSize = %d\n", hashSize);
/* load file records and add them to the hash list */
for (uint i = 0; i < hashSize; i++) {
@@ -63,12 +63,12 @@ FileSystem::FileSystem(const char *hashFilename) {
if (entry.filename[0]) {
/*
- debug(kDebugCore, " filename: %s\n", entry.filename);
- debug(kDebugCore, " hagfile: %d\n", entry.hagfile);
- debug(kDebugCore, " disks: %d\n", entry.disks);
- debug(kDebugCore, " offset: %08X\n", entry.offset);
- debug(kDebugCore, " size: %d\n", entry.size);
- debug(kDebugCore, " next: %08X\n", entry.next);
+ debugCN(kDebugCore, " filename: %s\n", entry.filename);
+ debugCN(kDebugCore, " hagfile: %d\n", entry.hagfile);
+ debugCN(kDebugCore, " disks: %d\n", entry.disks);
+ debugCN(kDebugCore, " offset: %08X\n", entry.offset);
+ debugCN(kDebugCore, " size: %d\n", entry.size);
+ debugCN(kDebugCore, " next: %08X\n", entry.next);
*/
_fileEntries[entry.filename] = entry;
}
@@ -90,7 +90,7 @@ FileSystem::FileSystem(const char *hashFilename) {
_hagEntries[entry.fileIndex].hagFile->open(_hagEntries[entry.fileIndex].filename);
if (!_hagEntries[entry.fileIndex].hagFile->isOpen()) {
- debug(kDebugCore, "FileSystem::FileSystem: error opening hag %s\n", _hagEntries[entry.fileIndex].filename);
+ debugCN(kDebugCore, "FileSystem::FileSystem: error opening hag %s\n", _hagEntries[entry.fileIndex].filename);
}
}
@@ -113,7 +113,7 @@ Common::SeekableReadStream *FileSystem::loadFile(const char *resourceName, bool
Common::SeekableReadStream *result = NULL;
if (hfe) {
- //debug(kDebugCore, "FileSystem::loadFile() success opening %s\n", filename);
+ //debugCN(kDebugCore, "FileSystem::loadFile() success opening %s\n", filename);
HashHagEntry *hagEntry = &_hagEntries[hfe->hagfile];
if (preloadFlag) {
@@ -128,7 +128,7 @@ Common::SeekableReadStream *FileSystem::loadFile(const char *resourceName, bool
hfe->offset + hfe->size);
} else {
- debug(kDebugCore, "FileSystem::loadFile() error opening %s\n", resourceName);
+ debugCN(kDebugCore, "FileSystem::loadFile() error opening %s\n", resourceName);
}
return result;
@@ -207,7 +207,7 @@ void ResourceManager::toss(const char *resourceName) {
if (!strcmp(r->name, resourceName)) {
r->flags |= kResourcePurge;
- //debug(kDebugCore, "M4ResourceManager::toss: mark resource %s to be purged\n", resourceName);
+ //debugCN(kDebugCore, "M4ResourceManager::toss: mark resource %s to be purged\n", resourceName);
}
}
}
@@ -510,7 +510,7 @@ M4ResourceManager::~M4ResourceManager() {
}
Common::SeekableReadStream *M4ResourceManager::loadResource(const char *resourceName, bool preloadFlag) {
- //debug(kDebugCore, "M4ResourceManager::loadResource() loading resource %s\n", resourceName);
+ //debugCN(kDebugCore, "M4ResourceManager::loadResource() loading resource %s\n", resourceName);
Common::SeekableReadStream* result = NULL;
if (_hfs) {
// actually load the resource