diff options
| author | James Brown | 2002-10-15 10:59:53 +0000 |
|---|---|---|
| committer | James Brown | 2002-10-15 10:59:53 +0000 |
| commit | 0b43ca86a7aeac418606b4ce48aec8b84edb11b9 (patch) | |
| tree | 8a1df94437721a01bcb91910752ec7e3fd3cd6c2 | |
| parent | dc87eff416e9fc0b642226bd8520437a70b56bd2 (diff) | |
| download | scummvm-rg350-0b43ca86a7aeac418606b4ce48aec8b84edb11b9.tar.gz scummvm-rg350-0b43ca86a7aeac418606b4ce48aec8b84edb11b9.tar.bz2 scummvm-rg350-0b43ca86a7aeac418606b4ce48aec8b84edb11b9.zip | |
Patch 623391: Verb shadow fix (MI2)
svn-id: r5150
| -rw-r--r-- | scumm/resource.cpp | 2 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp index 073d0f47eb..adfca29156 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -450,8 +450,6 @@ void Scumm::loadCharset(int no) if (_gameId == GID_INDY4 && no == 0) no = 1; - memset(_charsetData, 0, sizeof(_charsetData)); - assert(no < (int)sizeof(_charsetData) / 16); checkRange(_maxCharsets - 1, 1, no, "Loading illegal charset %d"); diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index f7a1adbd7f..9e3c5343dc 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -206,6 +206,8 @@ void Scumm::scummInit() else _resourceHeaderSize = 8; + memset(_charsetData, 0, sizeof(_charsetData)); + if (!(_features & GF_SMALL_NAMES)) loadCharset(1); |