diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-27 23:30:18 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-27 23:30:18 +0200 |
| commit | 5bfc376d1cee0f941657a771b87a3ee030d31c56 (patch) | |
| tree | de739c3845aa3f5bb9cb4bb79236551d5f3fc8b5 /src/common/resourcemanager.cpp | |
| parent | c53bc90dbaa876a86f762a3d864b1f920e2b8071 (diff) | |
| parent | d4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50 (diff) | |
| download | manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.gz manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.bz2 manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.xz manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.zip | |
Merge branch 'master' into lpc2012
Diffstat (limited to 'src/common/resourcemanager.cpp')
| -rw-r--r-- | src/common/resourcemanager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/resourcemanager.cpp b/src/common/resourcemanager.cpp index 45735b46..92a85914 100644 --- a/src/common/resourcemanager.cpp +++ b/src/common/resourcemanager.cpp @@ -91,11 +91,11 @@ char *ResourceManager::loadFile(const std::string &fileName, int &fileSize) PHYSFS_file *file = PHYSFS_openRead(fileName.c_str()); // If the handler is an invalid pointer indicate failure - if (file == NULL) + if (file == nullptr) { LOG_WARN("Failed to load '" << fileName << "': " << PHYSFS_getLastError()); - return NULL; + return nullptr; } // Get the size of the file @@ -108,7 +108,7 @@ char *ResourceManager::loadFile(const std::string &fileName, int &fileSize) free(buffer); LOG_WARN("Failed to load '" << fileName << "': " << PHYSFS_getLastError()); - return NULL; + return nullptr; } // Close the file and let the user deallocate the memory |