diff options
| author | Max Horn | 2003-12-27 14:03:07 +0000 |
|---|---|---|
| committer | Max Horn | 2003-12-27 14:03:07 +0000 |
| commit | d0ceed85a5f74b10d29f1295dd5642fdef4c5a3f (patch) | |
| tree | b65840e321fdf684ed39ebad38cffdef595be8ed | |
| parent | ed41771d1fb07350ed5ea1a49e0c457e43e245be (diff) | |
| download | scummvm-rg350-d0ceed85a5f74b10d29f1295dd5642fdef4c5a3f.tar.gz scummvm-rg350-d0ceed85a5f74b10d29f1295dd5642fdef4c5a3f.tar.bz2 scummvm-rg350-d0ceed85a5f74b10d29f1295dd5642fdef4c5a3f.zip | |
cleanup
svn-id: r11961
| -rw-r--r-- | scumm/charset.cpp | 6 | ||||
| -rw-r--r-- | scumm/smush/smush_player.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scumm/charset.cpp b/scumm/charset.cpp index 6b3cae795f..f555e2ecf1 100644 --- a/scumm/charset.cpp +++ b/scumm/charset.cpp @@ -1017,9 +1017,9 @@ void CharsetRendererClassic::printChar(int chr) { if (is2byte) { _dropShadow = true; - charPtr = g_scumm->get2byteCharPtr(chr); - width = g_scumm->_2byteWidth; - height = g_scumm->_2byteHeight; + charPtr = _vm->get2byteCharPtr(chr); + width = _vm->_2byteWidth; + height = _vm->_2byteHeight; offsX = offsY = 0; } else { uint32 charOffs = READ_LE_UINT32(_fontPtr + chr * 4 + 4); diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp index 1897923fcc..980668556a 100644 --- a/scumm/smush/smush_player.cpp +++ b/scumm/smush/smush_player.cpp @@ -380,7 +380,7 @@ void SmushPlayer::handleIACT(Chunk &b) { int32 size = b.getDword(); int32 bsize = b.getSize() - 18; - if (g_scumm->_gameId != GID_CMI) { + if (_scumm->_gameId != GID_CMI) { int32 track = track_id; if (track_flags == 1) { track = track_id + 100; |