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

Move function as requested.

Browse source 
svn-id: r14844
This commit is contained in:
Travis Howell 2004-08-31 07:40:28 +00:00
parent 93584bcdc3
commit 0ab96ee6c8
4 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

24
scumm/charset.cpp
View file

@ -50,30 +50,6 @@ CharsetRenderer::CharsetRenderer(ScummEngine *vm) {
_curId = 0;
}
int CharsetRenderer::getLetter(int letter) {
int offset, result;
byte *ptr = _vm->getResourceAddress(rtCharset, _curId);
if (!ptr)
error("CharsetRenderer::getLetter: charset %d not found!", _curId);
offset = READ_LE_UINT32(ptr + 29 + letter);
if (offset == 0)
return 0;
ptr += offset;
result = READ_LE_UINT16(ptr + 2);
byte start = *ptr;
if (result >= 0x80) {
result = result - 256 + start;
} else {
result += start;
};
return (result);
}
void CharsetRendererCommon::setCurID(byte id) {
checkRange(_vm->_numCharsets - 1, 0, id, "Printing with bad charset %d");

1
scumm/charset.h
View file

@ -71,7 +71,6 @@ public:
virtual void printChar(int chr) = 0;
virtual void drawChar(int chr, const Graphics::Surface &s, int x, int y) {}
int getLetter(int letter);
int getStringWidth(int a, const byte *str);
void addLinebreaks(int a, byte *str, int pos, int maxwidth);

1
scumm/intern.h
View file

@ -615,6 +615,7 @@ protected:
virtual const char *getOpcodeDesc(byte i);
byte stringLen(byte *);
int getCharsetOffset(int letter);
/* Version 7 script opcodes */
void o7_cursorCommand();

30
scumm/script_v7he.cpp
View file

@ -407,6 +407,31 @@ byte ScummEngine_v7he::stringLen(byte *ptr) {
return len;
}
int ScummEngine_v7he::getCharsetOffset(int letter) {
int offset, result;
int id = _charset->getCurID();
byte *ptr = getResourceAddress(rtCharset, id);
if (!ptr)
error("getCharsetOffset: charset %d not found!", id);
offset = READ_LE_UINT32(ptr + 29 + letter);
if (offset == 0)
return 0;
ptr += offset;
result = READ_LE_UINT16(ptr + 2);
byte start = *ptr;
if (result >= 0x80) {
result = result - 256 + start;
} else {
result += start;
};
return (result);
}
void ScummEngine_v7he::o7_cursorCommand() {
int a, i;
int args[16];
@ -726,8 +751,7 @@ void ScummEngine_v7he::o7_unknownED() {
writeVar(0, array);
while (len >= pos) {
letter = readArray(0, 0, pos);
if (letter)
result += _charset->getLetter(letter);
result += getCharsetOffset(letter);
pos++;
}
@ -903,7 +927,7 @@ void ScummEngine_v7he::o7_unknownF5() {
while (len <= pos) {
letter = readArray(0, 0, pos);
result += _charset->getLetter(letter);
result += getCharsetOffset(letter);
if (result >= ebx)
break;
pos++;