diff options
author | Torbjörn Andersson | 2004-10-21 06:44:25 +0000 |
---|---|---|
committer | Torbjörn Andersson | 2004-10-21 06:44:25 +0000 |
commit | 47face89e512ed8af1aebc510e61b7d16d4ccf75 (patch) | |
tree | 250e245e426dea442dae3c78ed29a97482cd1bf4 | |
parent | 06066565a6fc55d3715abc1821dd193d092920a6 (diff) | |
download | scummvm-rg350-47face89e512ed8af1aebc510e61b7d16d4ccf75.tar.gz scummvm-rg350-47face89e512ed8af1aebc510e61b7d16d4ccf75.tar.bz2 scummvm-rg350-47face89e512ed8af1aebc510e61b7d16d4ccf75.zip |
Fixed warnings. (Maybe it should be "const char *" instead, but then I got
warnings from a different part of the code. Ho, hum...)
svn-id: r15624
-rw-r--r-- | sword1/objectman.cpp | 2 | ||||
-rw-r--r-- | sword1/objectman.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sword1/objectman.cpp b/sword1/objectman.cpp index f9c392fe01..3e20f615b5 100644 --- a/sword1/objectman.cpp +++ b/sword1/objectman.cpp @@ -157,6 +157,6 @@ void ObjectMan::saveLiveList(uint16 *dest) { memcpy(dest, _liveList, TOTAL_SECTIONS * sizeof(uint16)); } -char *ObjectMan::_errorStr = "Error: Text not found."; +char ObjectMan::_errorStr[] = "Error: Text not found."; } // End of namespace Sword1 diff --git a/sword1/objectman.h b/sword1/objectman.h index 63bf689c26..39f032ad17 100644 --- a/sword1/objectman.h +++ b/sword1/objectman.h @@ -57,7 +57,7 @@ private: static const uint32 _textList[TOTAL_SECTIONS][7]; //a table of pointers to text files uint16 _liveList[TOTAL_SECTIONS]; //which sections are active uint8 *_cptData[TOTAL_SECTIONS]; - static char *_errorStr; + static char _errorStr[]; }; } // End of namespace Sword1 |