thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

moved CharsetRendere into its own header/source file; changed Scumm::_charset into a pointer, to make it possible to use different implementations of it

Browse source 
svn-id: r6147
This commit is contained in:
Max Horn 2002-12-25 21:04:47 +00:00
parent f1808d20ac
commit fca9ec09e7
14 changed files with 655 additions and 588 deletions
Download patch file Download diff file Expand all files Collapse all files

7
scumm/script_v6.cpp
View file

@ -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 {