diff options
author | Johannes Schickel | 2005-12-24 18:00:35 +0000 |
---|---|---|
committer | Johannes Schickel | 2005-12-24 18:00:35 +0000 |
commit | 515b69ddb87e5f7236f0e6ec98f65e7c6b4705d3 (patch) | |
tree | 7a3e9c0ee96acac8ebf1fe906bbea14c0e2fbb33 /kyra/staticres.cpp | |
parent | 268d05955f7896058a2a87966282a525d315aa9a (diff) | |
download | scummvm-rg350-515b69ddb87e5f7236f0e6ec98f65e7c6b4705d3.tar.gz scummvm-rg350-515b69ddb87e5f7236f0e6ec98f65e7c6b4705d3.tar.bz2 scummvm-rg350-515b69ddb87e5f7236f0e6ec98f65e7c6b4705d3.zip |
Started to implement button handling (atm only the inventory works)
Also implemented following opcodes:
- cmd_waitForConfirmationMouseClick
- cmd_drawItemShapeIntoScene
- cmd_setFireberryGlowPalette
- cmd_findBrightestFireberry
- cmd_sceneToDirection
- cmd_createAmuletJewel
- cmd_getCharactersMovementDelay
- cmd_setNoDrawShapesFlag
- cmd_checkClickOnNPC
- cmd_getFoyerItem
- cmd_setFoyerItem
- cmd_passiveProtection
- cmd_fillRect
Fixed bugs in some opcodes (mostly wrong debug calls)
Also changed debuglevel of all sprite functions to level 6 (from 5).
svn-id: r19831
Diffstat (limited to 'kyra/staticres.cpp')
-rw-r--r-- | kyra/staticres.cpp | 43 |
1 files changed, 41 insertions, 2 deletions
diff --git a/kyra/staticres.cpp b/kyra/staticres.cpp index 60bd198048..3158f2048f 100644 --- a/kyra/staticres.cpp +++ b/kyra/staticres.cpp @@ -653,14 +653,50 @@ const int8 KyraEngine::_addYPosTable[] = { 0, -2, -2, -2, 0, 2, 2, 2 }; -const int16 KyraEngine::_itemPosX[] = { +const uint16 KyraEngine::_itemPosX[] = { 95, 115, 135, 155, 175, 95, 115, 135, 155, 175 }; -const int8 KyraEngine::_itemPosY[] = { +const uint8 KyraEngine::_itemPosY[] = { 160, 160, 160, 160, 160, 181, 181, 181, 181, 181 }; +Button KyraEngine::_buttonData[] = { + { 0, 0x02, /*XXX,*/0, 0, 0, /*XXX,*/ 0x0400, 0, 0, 0, 0, 0, 0, 0, 0x05D, 0x9E, 0x13, 0x14, /*XXX,*/ 0, &KyraEngine::buttonInventoryCallback/*, XXX*/ }, + { 0, 0x01, /*XXX,*/1, 1, 1, /*XXX,*/ 0x0487, 0, 0, 0, 0, 0, 0, 0, 0x009, 0xA4, 0x36, 0x1E, /*XXX,*/ 0, 0/*opt_handleMenu, XXX*/ }, + { 0, 0x03, /*XXX,*/0, 0, 0, /*XXX,*/ 0x0400, 0, 0, 0, 0, 0, 0, 0, 0x071, 0x9E, 0x13, 0x14, /*XXX,*/ 0, &KyraEngine::buttonInventoryCallback/*, XXX*/ }, + { 0, 0x04, /*XXX,*/0, 0, 0, /*XXX,*/ 0x0400, 0, 0, 0, 0, 0, 0, 0, 0x085, 0x9E, 0x13, 0x14, /*XXX,*/ 0, &KyraEngine::buttonInventoryCallback/*, XXX*/ }, + { 0, 0x05, /*XXX,*/0, 0, 0, /*XXX,*/ 0x0400, 0, 0, 0, 0, 0, 0, 0, 0x099, 0x9E, 0x13, 0x14, /*XXX,*/ 0, &KyraEngine::buttonInventoryCallback/*, XXX*/ }, + { 0, 0x06, /*XXX,*/0, 0, 0, /*XXX,*/ 0x0400, 0, 0, 0, 0, 0, 0, 0, 0x0AD, 0x9E, 0x13, 0x14, /*XXX,*/ 0, &KyraEngine::buttonInventoryCallback/*, XXX*/ }, + { 0, 0x07, /*XXX,*/0, 0, 0, /*XXX,*/ 0x0400, 0, 0, 0, 0, 0, 0, 0, 0x05D, 0xB3, 0x13, 0x14, /*XXX,*/ 0, &KyraEngine::buttonInventoryCallback/*, XXX*/ }, + { 0, 0x08, /*XXX,*/0, 0, 0, /*XXX,*/ 0x0400, 0, 0, 0, 0, 0, 0, 0, 0x071, 0xB3, 0x13, 0x14, /*XXX,*/ 0, &KyraEngine::buttonInventoryCallback/*, XXX*/ }, + { 0, 0x09, /*XXX,*/0, 0, 0, /*XXX,*/ 0x0400, 0, 0, 0, 0, 0, 0, 0, 0x085, 0xB3, 0x13, 0x14, /*XXX,*/ 0, &KyraEngine::buttonInventoryCallback/*, XXX*/ }, + { 0, 0x0A, /*XXX,*/0, 0, 0, /*XXX,*/ 0x0400, 0, 0, 0, 0, 0, 0, 0, 0x099, 0xB3, 0x13, 0x14, /*XXX,*/ 0, &KyraEngine::buttonInventoryCallback/*, XXX*/ }, + { 0, 0x0B, /*XXX,*/0, 0, 0, /*XXX,*/ 0x0400, 0, 0, 0, 0, 0, 0, 0, 0x0AD, 0xB3, 0x13, 0x14, /*XXX,*/ 0, &KyraEngine::buttonInventoryCallback/*, XXX*/ }, + { 0, 0x15, /*XXX,*/1, 1, 1, /*XXX,*/ 0x0487, 0, 0, 0, 0, 0, 0, 0, 0x0FD, 0x9C, 0x1A, 0x12, /*XXX,*/ 0, 0/*buttonAmuletCallback, XXX*/ }, + { 0, 0x16, /*XXX,*/1, 1, 1, /*XXX,*/ 0x0487, 0, 0, 0, 0, 0, 0, 0, 0x0E7, 0xAA, 0x1A, 0x12, /*XXX,*/ 0, 0/*buttonAmuletCallback, XXX*/ }, + { 0, 0x17, /*XXX,*/1, 1, 1, /*XXX,*/ 0x0487, 0, 0, 0, 0, 0, 0, 0, 0x0FD, 0xB5, 0x1A, 0x12, /*XXX,*/ 0, 0/*buttonAmuletCallback, XXX*/ }, + { 0, 0x18, /*XXX,*/1, 1, 1, /*XXX,*/ 0x0487, 0, 0, 0, 0, 0, 0, 0, 0x113, 0xAA, 0x1A, 0x12, /*XXX,*/ 0, 0/*buttonAmuletCallback, XXX*/ } +}; + +Button *KyraEngine::_buttonDataListPtr[] = { + &_buttonData[1], + &_buttonData[2], + &_buttonData[3], + &_buttonData[4], + &_buttonData[5], + &_buttonData[6], + &_buttonData[7], + &_buttonData[8], + &_buttonData[9], + &_buttonData[10], + &_buttonData[11], + &_buttonData[12], + &_buttonData[13], + &_buttonData[14], + 0 +}; + const uint8 KyraEngine::_magicMouseItemStartFrame[] = { 0xAD, 0xB7, 0xBE, 0x00 }; @@ -679,4 +715,7 @@ const uint8 KyraEngine::_magicMouseItemEndFrame2[] = { const uint16 KyraEngine::_amuletX[] = { 231, 275, 253, 253 }; const uint16 KyraEngine::_amuletY[] = { 170, 170, 159, 181 }; + +const uint16 KyraEngine::_amuletX2[] = { 0x000, 0x0FD, 0x0E7, 0x0FD, 0x113, 0x000 }; +const uint16 KyraEngine::_amuletY2[] = { 0x000, 0x09F, 0x0AA, 0x0B5, 0x0AA, 0x000 }; } // End of namespace Kyra |