diff options
| author | Simei Yin | 2018-05-28 21:55:06 +0200 |
|---|---|---|
| committer | Simei Yin | 2018-05-29 22:37:10 +0200 |
| commit | 1ec5ef3e4df9ee3606bb4b3092fcf0d6f515563e (patch) | |
| tree | 315932a77380517ca7121f9b70b31981a0329321 /engines/sludge/newfatal.cpp | |
| parent | 0548765479b69f2aaaf153e6370ed262a80c1d2d (diff) | |
| download | scummvm-rg350-1ec5ef3e4df9ee3606bb4b3092fcf0d6f515563e.tar.gz scummvm-rg350-1ec5ef3e4df9ee3606bb4b3092fcf0d6f515563e.tar.bz2 scummvm-rg350-1ec5ef3e4df9ee3606bb4b3092fcf0d6f515563e.zip | |
SLUDGE: Move resource names to ResourceManager
Diffstat (limited to 'engines/sludge/newfatal.cpp')
| -rw-r--r-- | engines/sludge/newfatal.cpp | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/engines/sludge/newfatal.cpp b/engines/sludge/newfatal.cpp index 820b497e8e..a5069ae306 100644 --- a/engines/sludge/newfatal.cpp +++ b/engines/sludge/newfatal.cpp @@ -24,6 +24,7 @@ #include "sludge/allfiles.h" #include "sludge/errors.h" +#include "sludge/fileset.h" #include "sludge/newfatal.h" #include "sludge/sludge.h" #include "sludge/sound.h" @@ -35,9 +36,6 @@ DECLARE_SINGLETON(Sludge::FatalMsgManager); namespace Sludge { -extern int numResourceNames /* = 0*/; -extern Common::String *allResourceNames /*= ""*/; - int inFatal(const Common::String &str) { g_sludge->_soundMan->killSoundStuff(); error("%s", str.c_str()); @@ -73,8 +71,9 @@ void FatalMsgManager::setResourceForFatal(int n) { } int FatalMsgManager::fatal(const Common::String &str1) { - if (numResourceNames && _resourceForFatal != -1) { - Common::String r = resourceNameFromNum(_resourceForFatal); + ResourceManager *resMan = g_sludge->_resMan; + if (resMan->hasResourceNames() && _resourceForFatal != -1) { + Common::String r = resMan->resourceNameFromNum(_resourceForFatal); Common::String newStr = _fatalInfo + "\nResource: " + r + "\n\n" + str1; inFatal(newStr); } else { @@ -98,14 +97,4 @@ int fatal(const Common::String &str1, const Common::String &str2) { return 0; } -const Common::String resourceNameFromNum(int i) { - if (i == -1) - return NULL; - if (numResourceNames == 0) - return "RESOURCE"; - if (i < numResourceNames) - return allResourceNames[i]; - return "Unknown resource"; -} - } // End of namespace Sludge |