diff options
author | Strangerke | 2011-06-29 16:15:41 +0200 |
---|---|---|
committer | Strangerke | 2011-06-29 16:15:41 +0200 |
commit | b0c9c9122fc678074aba30068e5b36d347208e65 (patch) | |
tree | 79a99db08ec985f2e5f1e216823b1104d5b753fb /engines/m4/resource.cpp | |
parent | f2f3124246a77036f843dee2d83ad28084234ebc (diff) | |
parent | c32a3ea0d30336771bab460ecccb58c4614e6294 (diff) | |
download | scummvm-rg350-b0c9c9122fc678074aba30068e5b36d347208e65.tar.gz scummvm-rg350-b0c9c9122fc678074aba30068e5b36d347208e65.tar.bz2 scummvm-rg350-b0c9c9122fc678074aba30068e5b36d347208e65.zip |
Merge branch 'master' of github.com:scummvm/scummvm into soltys_wip2
Diffstat (limited to 'engines/m4/resource.cpp')
-rw-r--r-- | engines/m4/resource.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/m4/resource.cpp b/engines/m4/resource.cpp index 2ae29ca0bb..f5b2050052 100644 --- a/engines/m4/resource.cpp +++ b/engines/m4/resource.cpp @@ -313,7 +313,7 @@ const char *MADSResourceManager::getResourceFilename(const char *resourceName) { /** * Forms a resource name based on the passed specifiers */ -const char *MADSResourceManager::getResourceName(char asciiCh, int prefix, ExtensionType extType, +const char *MADSResourceManager::getResourceName(char asciiCh, int prefix, ExtensionType extType, const char *suffix, int index) { static char resourceName[100]; |