diff options
author | Filippos Karapetis | 2007-09-02 01:45:59 +0000 |
---|---|---|
committer | Filippos Karapetis | 2007-09-02 01:45:59 +0000 |
commit | 2182d758d07432d990b0e18beb569d539b901e00 (patch) | |
tree | 84e1a4c7d54773801530e0236e11c9a8651fd8fc /engines | |
parent | 38c21d65393690c1a392587ab4fbdd226bc32d6a (diff) | |
download | scummvm-rg350-2182d758d07432d990b0e18beb569d539b901e00.tar.gz scummvm-rg350-2182d758d07432d990b0e18beb569d539b901e00.tar.bz2 scummvm-rg350-2182d758d07432d990b0e18beb569d539b901e00.zip |
Initial implementation of preagi string drawing functions. They still need work, though
svn-id: r28812
Diffstat (limited to 'engines')
-rw-r--r-- | engines/agi/agi.h | 7 | ||||
-rw-r--r-- | engines/agi/preagi.cpp | 58 | ||||
-rw-r--r-- | engines/agi/preagi_mickey.cpp | 60 |
3 files changed, 88 insertions, 37 deletions
diff --git a/engines/agi/agi.h b/engines/agi/agi.h index 21774780de..8720153fa7 100644 --- a/engines/agi/agi.h +++ b/engines/agi/agi.h @@ -995,12 +995,17 @@ public: int16 p4, int16 p5, int16 p6, int16 p7) {} void releaseImageStack() {} - // Keyboard, preagi + // Keyboard void waitAnyKeyAnim(); int getSelection(int type); bool waitAnyKeyChoice(); void waitAnyKey(bool anim = false); int rnd(int hi) { return (rand() % hi + 1); } + + // Text + void drawStr(int row, int col, int attr, char *buffer); + void drawStrMiddle(int row, int attr, char *buffer); + void drawChar(int x, int y, int attr, int code, char *fontdata); }; } // End of namespace Agi diff --git a/engines/agi/preagi.cpp b/engines/agi/preagi.cpp index f24fbcd294..25e143e42f 100644 --- a/engines/agi/preagi.cpp +++ b/engines/agi/preagi.cpp @@ -39,6 +39,7 @@ #include "sound/mixer.h" #include "agi/agi.h" +#include "agi/font.h" #include "agi/graphics.h" #include "agi/sprite.h" #include "agi/opcodes.h" @@ -272,4 +273,61 @@ int PreAgiEngine::preAgiUnloadResource(int r, int n) { return _loader->unloadResource(r, n); } +// String functions +void PreAgiEngine::drawStr(int row, int col, int attr, char *buffer) +{ + int code; + + for (int iChar = 0; iChar < (int)strlen(buffer); iChar++) + { + code = buffer[iChar]; + + switch (code) + { + case '\n': + case 0x8D: + if (++row == 200 / 8) return; + col = 0; + break; + + case '|': + // swap attribute nibbles + break; + + default: + drawChar(col * 8, row * 8, attr, code, (char*)mickey_fontdata); + + if (++col == 320 / 8) + { + col = 0; + if (++row == 200 / 8) return; + } + } + } +} + +void PreAgiEngine::drawStrMiddle(int row, int attr, char *buffer) { + int col = (25 / 2) - (strlen(buffer) / 2); // 25 = 320 / 8 (maximum column) + drawStr(row, col, attr, buffer); +} + +void PreAgiEngine::drawChar(int x, int y, int attr, int code, char *fontdata) +{ + int cx, cy; + uint8 color; + + for (cy = 0; cy < 8; cy++) + { + for (cx = 0; cx < 8; cx++) + { + if (fontdata[(code * 8) + cy] & (1 << (7 - cx))) + color = attr & 0x0f; // foreground color + else + color = (attr & 0xf0) / 0x10; // background color + + _gfx->putPixelsA(x + cx, y + cy, 1, &color); + } + } +} + } // End of namespace Agi diff --git a/engines/agi/preagi_mickey.cpp b/engines/agi/preagi_mickey.cpp index fbb49cd0e6..1f1715ac98 100644 --- a/engines/agi/preagi_mickey.cpp +++ b/engines/agi/preagi_mickey.cpp @@ -195,8 +195,7 @@ void Mickey::printStr(char *buffer) { for (iRow = IDI_MSA_ROW_MENU_0; iRow < nRows; iRow++) { iCol = *(buffer + pc++); - //_vm->printText(buffer + pc, 0, iRow, iCol, strlen(buffer + pc), 0x0f & 0x0f, (0x0f & 0xf0) / 0x10); - // drawStr(iRow, iCol, buffer + pc); // TODO + _vm->drawStr(iRow, iCol, IDA_DEFAULT, buffer + pc); pc += strlen(buffer + pc) + 1; } } @@ -259,9 +258,8 @@ void Mickey::drawMenu(MSA_MENU menu, int sel0, int sel1) { else attr = IDA_DEFAULT; - // TODO - //drawStrAttr(IDI_MSA_ROW_MENU_0 + iRow, menu.row[iRow].entry[iWord].x0, - // attr, (char *)menu.row[iRow].entry[iWord].szText); + _vm->drawStr(IDI_MSA_ROW_MENU_0 + iRow, menu.row[iRow].entry[iWord].x0, + attr, (char *)menu.row[iRow].entry[iWord].szText); } } @@ -576,16 +574,16 @@ void Mickey::debug() { //ClearScreen(IDA_DEFAULT); // TODO sprintf(szLine, IDS_MSA_DEBUG_ROOM, game.iRoom); - //drawStr(5, 10, szLine); // TODO + _vm->drawStr(5, 10, IDA_DEFAULT, szLine); if (game.iRoom < IDI_MSA_MAX_PIC_ROOM) { if (game.iRmObj[game.iRoom] != IDI_MSA_OBJECT_NONE) { sprintf(szLine, IDS_MSA_DEBUG_OBJ, game.iRmObj[game.iRoom]); - //drawStr(7, 10, szLine); // TODO + _vm->drawStr(7, 10, IDA_DEFAULT, szLine); } } else { sprintf(szLine, IDS_MSA_DEBUG_OBJ, 32); - //drawStr(7, 10, szLine); // TODO + _vm->drawStr(7, 10, IDA_DEFAULT, szLine); } _vm->_gfx->doUpdate(); _vm->_system->updateScreen(); // TODO: this should go in the game's main loop @@ -925,7 +923,7 @@ void Mickey::printStory() { //ClearScreen(IDA_DEFAULT); // TODO for (iRow = 0; iRow < 25; iRow++) { strcpy(szLine, buffer + pBuf); - //drawStr(iRow, 0, szLine); // TODO + _vm->drawStr(iRow, 0, IDA_DEFAULT, szLine); pBuf += strlen(szLine) + 1; } _vm->_gfx->doUpdate(); @@ -935,7 +933,7 @@ void Mickey::printStory() { //ClearScreen(IDA_DEFAULT); // TODO for (iRow = 0; iRow < 21; iRow++) { strcpy(szLine, buffer + pBuf); - //drawStr(iRow, 0, szLine); // TODO + _vm->drawStr(iRow, 0, IDA_DEFAULT, szLine); // TODO pBuf += strlen(szLine) + 1; } _vm->_gfx->doUpdate(); @@ -997,7 +995,7 @@ void Mickey::pressOB(int iButton) { // print pressed buttons printExeStr(IDO_MSA_MICKEY_HAS_PRESSED); - //drawStr(IDI_MSA_ROW_BUTTONS, IDI_MSA_COL_BUTTONS, szButtons); // TODO + _vm->drawStr(IDI_MSA_ROW_BUTTONS, IDI_MSA_COL_BUTTONS, IDA_DEFAULT, szButtons); _vm->_gfx->doUpdate(); _vm->_system->updateScreen(); // TODO: this should go in the game's main loop _vm->waitAnyKey(); @@ -1023,8 +1021,7 @@ void Mickey::checkAirSupply(bool fSuit, int *iSupply) { void Mickey::insertDisk(int iDisk) { //clearTextArea(); // TODO - // TODO - //drawStr(IDI_MSA_ROW_INSERT_DISK, IDI_MSA_COL_INSERT_DISK, (char *)IDS_MSA_INSERT_DISK[iDisk]); + _vm->drawStr(IDI_MSA_ROW_INSERT_DISK, IDI_MSA_COL_INSERT_DISK, IDA_DEFAULT, (char *)IDS_MSA_INSERT_DISK[iDisk]); _vm->_gfx->doUpdate(); _vm->_system->updateScreen(); // TODO: this should go in the game's main loop _vm->waitAnyKey(); @@ -1083,9 +1080,8 @@ void Mickey::flipSwitch() { printExeStr(game.iClue[game.nXtals]); #ifdef _DEBUG - // TODO - //drawStr(24, 12, (char *)IDS_MSA_NAME_PLANET_2[game.iPlanetXtal[game.nXtals]]); - //drawStr(24, 22, (char *)IDS_MSA_ADDR_PLANET[game.iPlanetXtal[game.nXtals]]); + _vm->drawStr(24, 12, IDA_DEFAULT, (char *)IDS_MSA_NAME_PLANET_2[game.iPlanetXtal[game.nXtals]]); + _vm->drawStr(24, 22, IDA_DEFAULT, (char *)IDS_MSA_ADDR_PLANET[game.iPlanetXtal[game.nXtals]]); strcpy(game.szAddr, (char *)IDS_MSA_ADDR_PLANET[game.iPlanetXtal[game.nXtals]]); game.nButtons = strlen(game.szAddr); _vm->_gfx->doUpdate(); @@ -1100,21 +1096,18 @@ void Mickey::flipSwitch() { } void Mickey::inventory() { - //int iRow = IDI_MSA_ROW_INV_ITEMS; + int iRow = IDI_MSA_ROW_INV_ITEMS; char szCrystals[12] = {0}; sprintf(szCrystals, IDS_MSA_CRYSTALS, IDS_MSA_CRYSTAL_NO[game.nXtals]); - // TODO - /* - ClearScreen(IDA_DEFAULT); - drawStr(IDI_MSA_ROW_INV_TITLE, IDI_MSA_COL_INV_TITLE, IDS_MSA_INVENTORY); - drawStr(IDI_MSA_ROW_INV_CRYSTALS, IDI_MSA_COL_INV_ITEMS, szCrystals); - */ + // ClearScreen(IDA_DEFAULT); + _vm->drawStr(IDI_MSA_ROW_INV_TITLE, IDI_MSA_COL_INV_TITLE, IDA_DEFAULT, IDS_MSA_INVENTORY); + _vm->drawStr(IDI_MSA_ROW_INV_CRYSTALS, IDI_MSA_COL_INV_ITEMS, IDA_DEFAULT, szCrystals); for (int iItem = 0; iItem < IDI_MSA_MAX_ITEM; iItem++) { if (game.fItem[game.iItem[iItem]] && (game.iItem[iItem] != IDI_MSA_OBJECT_NONE)) { - //drawStr(iRow++, IDI_MSA_COL_INV_ITEMS, (char *)IDS_MSA_NAME_ITEM[game.iItem[iItem]]); // TODO + _vm->drawStr(iRow++, IDI_MSA_COL_INV_ITEMS, IDA_DEFAULT, (char *)IDS_MSA_NAME_ITEM[game.iItem[iItem]]); } } @@ -1130,7 +1123,6 @@ void Mickey::randomize() { int iHint = 0; bool done; - // TODO memset(game.iPlanetXtal, 0, sizeof(game.iPlanetXtal)); memset(game.iClue, 0, sizeof(game.iClue)); @@ -1815,12 +1807,10 @@ bool Mickey::parse(int cmd, int arg) { break; case IDI_MSA_ACTION_READ_GAUGE: printDatString(arg); - /* - drawStr(IDI_MSA_ROW_TEMPERATURE, IDI_MSA_COL_TEMPERATURE_C, + _vm->drawStr(IDI_MSA_ROW_TEMPERATURE, IDI_MSA_COL_TEMPERATURE_C, IDA_DEFAULT, (char *)IDS_MSA_TEMP_C[game.iPlanet]); - drawStr(IDI_MSA_ROW_TEMPERATURE, IDI_MSA_COL_TEMPERATURE_F, + _vm->drawStr(IDI_MSA_ROW_TEMPERATURE, IDI_MSA_COL_TEMPERATURE_F, IDA_DEFAULT, (char *)IDS_MSA_TEMP_F[game.iPlanet]); - */ _vm->_gfx->doUpdate(); _vm->_system->updateScreen(); // TODO: this should go in the game's main loop _vm->waitAnyKey(); @@ -1853,9 +1843,8 @@ bool Mickey::parse(int cmd, int arg) { memset(game.szAddr, 0, sizeof(game.szAddr)); drawRoom(); printDatString(22); - // TODO - //drawStr(IDI_MSA_ROW_PLANET, IDI_MSA_COL_PLANET, - // (char *)IDS_MSA_PLANETS[game.iPlanet]); + _vm->drawStr(IDI_MSA_ROW_PLANET, IDI_MSA_COL_PLANET, IDA_DEFAULT, + (char *)IDS_MSA_PLANETS[game.iPlanet]); _vm->_gfx->doUpdate(); _vm->_system->updateScreen(); // TODO: this should go in the game's main loop _vm->waitAnyKeyAnim(); @@ -1966,9 +1955,8 @@ void Mickey::debug_DrawObjs() { ///clearTextArea(); // TODO sprintf(szTitle, "Object %d", iObj); - // TODO - //drawStrAttrMiddle(22, IDA_DEFAULT, szTitle); - //drawStrAttrMiddle(23, IDA_DEFAULT, (char *)IDS_MSA_NAME_OBJ[iObj]); + _vm->drawStrMiddle(22, IDA_DEFAULT, szTitle); + _vm->drawStrMiddle(23, IDA_DEFAULT, (char *)IDS_MSA_NAME_OBJ[iObj]); _vm->_gfx->doUpdate(); _vm->_system->updateScreen(); // TODO: this should go in the game's main loop _vm->waitAnyKey(); @@ -1983,7 +1971,7 @@ void Mickey::debug_DrawPics(){ //clearTextArea(); // TODO sprintf(szTitle, "Picture %d", iPic); - //drawStrAttrMiddle(22, IDA_DEFAULT, szTitle); // TODO + _vm->drawStrMiddle(22, IDA_DEFAULT, szTitle); _vm->_gfx->doUpdate(); _vm->_system->updateScreen(); // TODO: this should go in the game's main loop _vm->waitAnyKey(); |