diff options
| author | Max Horn | 2002-12-25 21:04:47 +0000 |
|---|---|---|
| committer | Max Horn | 2002-12-25 21:04:47 +0000 |
| commit | fca9ec09e7709ff4400d2a9a7fd76f4f21781006 (patch) | |
| tree | 2c9dd18841983469c4780c75d90762f8a167c048 /scumm/script_v6.cpp | |
| parent | f1808d20ac90f4212fd14aeaf544a8aaac6a3fbc (diff) | |
| download | scummvm-rg350-fca9ec09e7709ff4400d2a9a7fd76f4f21781006.tar.gz scummvm-rg350-fca9ec09e7709ff4400d2a9a7fd76f4f21781006.tar.bz2 scummvm-rg350-fca9ec09e7709ff4400d2a9a7fd76f4f21781006.zip | |
moved CharsetRendere into its own header/source file; changed Scumm::_charset into a pointer, to make it possible to use different implementations of it
svn-id: r6147
Diffstat (limited to 'scumm/script_v6.cpp')
| -rw-r--r-- | scumm/script_v6.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index 99d8e89054..f27c6fe18e 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -24,6 +24,7 @@ #include "stdafx.h" #include "scumm.h" #include "actor.h" +#include "charset.h" #include "imuse.h" #include "intern.h" #include "sound.h" @@ -863,7 +864,7 @@ void Scumm_v6::o6_cursorCommand() case 0x9D: /* set charset colors */ getStackList(args, sizeof(args) / sizeof(args[0])); for (i = 0; i < 16; i++) - _charset._colorMap[i] = _charsetData[_string[1].t_charset][i] = (unsigned char)args[i]; + _charset->_colorMap[i] = _charsetData[_string[1].t_charset][i] = (unsigned char)args[i]; break; case 0xD6: makeCursorColorTransparent(pop()); @@ -2581,10 +2582,10 @@ void Scumm_v6::o6_miscOps() setStringVars(0); addMessageToStack(getStringAddressVar(VAR_STRING2DRAW)); if (strncmp("/SYSTEM.007/ /", (char *)buf, 14) == 0) { - translateText(buf + 13, _charset._buffer); + translateText(buf + 13, _charset->_buffer); //description(); } else if (strncmp("/SYSTEM.007/ ", (char *)buf, 13) == 0) { - strcpy((char *)_charset._buffer, (char *)buf + 13); + strcpy((char *)_charset->_buffer, (char *)buf + 13); //description(); } } else { |