aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/chargen.cpp
diff options
context:
space:
mode:
authorathrxx2012-02-13 18:39:50 +0100
committerathrxx2012-02-21 21:48:39 +0100
commit86a817beb5eef248c5f5e28f18133db802a59c2e (patch)
treedc606582deb0ccd10114fdf77554a8a4697110aa /engines/kyra/chargen.cpp
parent66ba9343987d67e8bf8e1742fcf139dee95a8448 (diff)
downloadscummvm-rg350-86a817beb5eef248c5f5e28f18133db802a59c2e.tar.gz
scummvm-rg350-86a817beb5eef248c5f5e28f18133db802a59c2e.tar.bz2
scummvm-rg350-86a817beb5eef248c5f5e28f18133db802a59c2e.zip
KYRA: (EOB) - start work on CGA and EGA graphics modes
Diffstat (limited to 'engines/kyra/chargen.cpp')
-rw-r--r--engines/kyra/chargen.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index ed761e53c6..23274349e7 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -248,10 +248,10 @@ void CharacterGenerator::init() {
_faceShapes = new uint8*[44];
for (int i = 0; i < 44; i++)
- _faceShapes[i] = _screen->encodeShape((i % 10) << 2, (i / 10) << 5, 4, 32, true);
+ _faceShapes[i] = _screen->encodeShape((i % 10) << 2, (i / 10) << 5, 4, 32, true, _vm->_cgaMappingDefault);
_screen->_curPage = 0;
- _screen->loadEoBBitmap("CHARGEN", 0, 3, 3, 0);
+ _screen->loadEoBBitmap("CHARGEN", _vm->_cgaMappingDefault, 3, 3, 0);
_screen->loadShapeSetBitmap("CHARGENB", 3, 3);
if (_chargenMagicShapes) {
for (int i = 0; i < 10; i++)
@@ -261,14 +261,14 @@ void CharacterGenerator::init() {
_chargenMagicShapes = new uint8*[10];
for (int i = 0; i < 10; i++)
- _chargenMagicShapes[i] = _screen->encodeShape(i << 2, 0, 4, 32, true);
+ _chargenMagicShapes[i] = _screen->encodeShape(i << 2, 0, 4, 32, true, _vm->_cgaMappingDefault);
for (int i = 0; i < 17; i++) {
const CreatePartyModButton *c = &_chargenModButtons[i];
- _chargenButtonLabels[i] = c->labelW ? _screen->encodeShape(c->encodeLabelX, c->encodeLabelY, c->labelW, c->labelH, true) : 0;
+ _chargenButtonLabels[i] = c->labelW ? _screen->encodeShape(c->encodeLabelX, c->encodeLabelY, c->labelW, c->labelH, true, _vm->_cgaMappingDefault) : 0;
}
- _screen->copyPage(3, 2);
+ _screen->convertPage(3, 2, _vm->_cgaMappingDefault);
_screen->_curPage = 0;
_screen->copyRegion(144, 64, 0, 0, 180, 128, 0, 2, Screen::CR_NO_P_CHECK);
_screen->updateScreen();