[Scummvm-cvs-logs] SF.net SVN: scummvm:[44061] scummvm/trunk/engines/kyra
athrxx at users.sourceforge.net
athrxx at users.sourceforge.net
Sun Sep 13 16:44:37 CEST 2009
Revision: 44061
http://scummvm.svn.sourceforge.net/scummvm/?rev=44061&view=rev
Author: athrxx
Date: 2009-09-13 14:44:37 +0000 (Sun, 13 Sep 2009)
Log Message:
-----------
LOL/Floppy: fixed size of menu boxes
Modified Paths:
--------------
scummvm/trunk/engines/kyra/lol.h
scummvm/trunk/engines/kyra/saveload_lol.cpp
scummvm/trunk/engines/kyra/script_lol.cpp
scummvm/trunk/engines/kyra/sprites_lol.cpp
scummvm/trunk/engines/kyra/staticres.cpp
Modified: scummvm/trunk/engines/kyra/lol.h
===================================================================
--- scummvm/trunk/engines/kyra/lol.h 2009-09-13 14:12:39 UTC (rev 44060)
+++ scummvm/trunk/engines/kyra/lol.h 2009-09-13 14:44:37 UTC (rev 44061)
@@ -147,7 +147,7 @@
uint8 curDistWeapon;
int8 distAttackTick;
uint16 assignedItems;
- uint8 field_2A[4];
+ uint8 equipmentShapes[4];
};
struct ItemInPlay {
@@ -1335,7 +1335,7 @@
uint8 *_pageBuffer1;
uint8 *_pageBuffer2;
-
+
// spells
typedef Common::Functor1Mem<ActiveSpell*, int, LoLEngine> SpellProc;
Common::Array<const SpellProc*> _spellProcs;
Modified: scummvm/trunk/engines/kyra/saveload_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload_lol.cpp 2009-09-13 14:12:39 UTC (rev 44060)
+++ scummvm/trunk/engines/kyra/saveload_lol.cpp 2009-09-13 14:44:37 UTC (rev 44061)
@@ -233,7 +233,7 @@
m->distAttackTick = in.readSByte();
m->assignedItems = in.readUint16BE();
m->properties = &_monsterProperties[m->type];
- in.read(m->field_2A, 4);
+ in.read(m->equipmentShapes, 4);
}
for (int ii = 0; ii < 8; ii++) {
@@ -413,7 +413,7 @@
out->writeByte(m->curDistWeapon);
out->writeSByte(m->distAttackTick);
out->writeUint16BE(m->assignedItems);
- out->write(m->field_2A, 4);
+ out->write(m->equipmentShapes, 4);
}
for (int ii = 0; ii < 8; ii++) {
Modified: scummvm/trunk/engines/kyra/script_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_lol.cpp 2009-09-13 14:12:39 UTC (rev 44060)
+++ scummvm/trunk/engines/kyra/script_lol.cpp 2009-09-13 14:44:37 UTC (rev 44061)
@@ -852,7 +852,7 @@
l->destDirection = l->direction;
for (int ii = 0; ii < 4; ii++)
- l->field_2A[ii] = stackPos(7 + ii);
+ l->equipmentShapes[ii] = stackPos(7 + ii);
checkSceneUpdateNeed(l->block);
return i;
@@ -2280,7 +2280,7 @@
int LoLEngine::olol_characterSays(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_characterSays(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
-
+
if (!_flags.isTalkie)
return 0;
Modified: scummvm/trunk/engines/kyra/sprites_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sprites_lol.cpp 2009-09-13 14:12:39 UTC (rev 44060)
+++ scummvm/trunk/engines/kyra/sprites_lol.cpp 2009-09-13 14:44:37 UTC (rev 44061)
@@ -497,7 +497,7 @@
if (testWallFlag(block, -1, wallFlag))
return 1;
_monsterCurBlock = 0;
- }
+ }
if (!(testFlag & 2))
return 0;
@@ -667,7 +667,7 @@
uint8 *ovl2 = drawItemOrMonster(shp, ovl1, m->x + _monsterShiftOffs[m->shiftStep << 1], m->y + _monsterShiftOffs[(m->shiftStep << 1) + 1], 0, 0, flg | 1, -1, flip);
for (int i = 0; i < 4; i++) {
- int v = m->field_2A[i] - 1;
+ int v = m->equipmentShapes[i] - 1;
if (v == -1)
break;
Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp 2009-09-13 14:12:39 UTC (rev 44060)
+++ scummvm/trunk/engines/kyra/staticres.cpp 2009-09-13 14:44:37 UTC (rev 44061)
@@ -2079,16 +2079,20 @@
for (uint i = 0; i < ARRAYSIZE(_menuButtons); ++i)
GUI_V2_BUTTON(_menuButtons[i], i, 0, 0, 0, 0, 0, 0x4487, 0, 0, 0, 0, 0, 0xfe, 0x01, 0xfe, 0x01, 0xfe, 0x01, 0);
- GUI_LOL_MENU(_mainMenu, 9, 0x4000, 0, _vm->gameFlags().isTalkie ? 7 : 6, -1, -1, -1, -1);
+ if (_vm->gameFlags().isTalkie)
+ GUI_LOL_MENU(_mainMenu, 9, 0x4000, 0, 7, -1, -1, -1, -1);
+ else
+ GUI_LOL_MENU(_mainMenu, 17, 0x4000, 0, 6, -1, -1, -1, -1);
+
GUI_LOL_MENU_ITEM(_mainMenu.item[0], 0x4001, 16, 23, 176, 15, 0, 0);
GUI_LOL_MENU_ITEM(_mainMenu.item[1], 0x4002, 16, 40, 176, 15, 0, 0);
GUI_LOL_MENU_ITEM(_mainMenu.item[2], 0x4003, 16, 57, 176, 15, 0, 0);
GUI_LOL_MENU_ITEM(_mainMenu.item[3], 0x4004, 16, 74, 176, 15, 0, 0);
-
+
if (_vm->gameFlags().isTalkie) {
GUI_LOL_MENU_ITEM(_mainMenu.item[4], 0x42D9, 16, 91, 176, 15, 0, 0);
GUI_LOL_MENU_ITEM(_mainMenu.item[5], 0x4006, 16, 108, 176, 15, 0, 0);
- GUI_LOL_MENU_ITEM(_mainMenu.item[6], 0x4005, 88, 127, 104, 15, 0, 110);
+ GUI_LOL_MENU_ITEM(_mainMenu.item[6], 0x4005, 88, 127, 104, 15, 0, 110);
} else {
GUI_LOL_MENU_ITEM(_mainMenu.item[4], 0x4006, 16, 91, 176, 15, 0, 0);
GUI_LOL_MENU_ITEM(_mainMenu.item[5], 0x4005, 88, 110, 104, 15, 0, 110);
@@ -3214,7 +3218,7 @@
{ 0x0B, 0x8C, 0x10, 0x2B, 0x3D, 0x01, 0x00, 0x00 }, // Main menu box (4 entries)
{ 0x04, 0x59, 0x20, 0x3C, 0x00, 0x00, 0x00, 0x00 },
{ 0x05, 0x6E, 0x1E, 0x0C, 0xFE, 0x01, 0x00, 0x00 },
- { 0x07, 0x19, 0x1A, 0x97, 0x00, 0x00, 0x00, 0x00 },
+ { 0x07, 0x19, 0x1A, 0x97, 0x00, 0x00, 0x00, 0x00 }, // Ingame main menu box CD version
{ 0x03, 0x1E, 0x22, 0x8C, 0x00, 0x00, 0x00, 0x00 },
{ 0x02, 0x48, 0x24, 0x34, 0x00, 0x00, 0x00, 0x00 },
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
@@ -3230,7 +3234,7 @@
{ 0x01, 0x20, 0x26, 0x80, 0xDC, 0xFD, 0x00, 0x00 }, // Credits
{ 0x09, 0x29, 0x08, 0x2C, 0x00, 0x00, 0x00, 0x00 },
{ 0x19, 0x29, 0x08, 0x2C, 0x00, 0x00, 0x00, 0x00 },
- { 0x01, 0x02, 0x26, 0x14, 0x00, 0x0F, 0x0E, 0x00 }
+ { 0x01, 0x02, 0x26, 0x14, 0x00, 0x0F, 0x0E, 0x00 },
};
const ScreenDim Screen_LoL::_screenDimTable16C[] = {
@@ -3259,7 +3263,7 @@
{ 0x01, 0x20, 0x26, 0x80, 0xDC, 0xFD, 0x00, 0x00 }, // Credits (TODO: Check this!)
{ 0x09, 0x29, 0x08, 0x2C, 0x00, 0x00, 0x00, 0x00 },
{ 0x19, 0x29, 0x08, 0x2C, 0x00, 0x00, 0x00, 0x00 },
- { 0x01, 0x02, 0x26, 0x14, 0x00, 0x0F, 0x0E, 0x00 }
+ { 0x01, 0x02, 0x26, 0x14, 0x00, 0x0F, 0x0E, 0x00 },
};
const int Screen_LoL::_screenDimTableCount = ARRAYSIZE(Screen_LoL::_screenDimTable256C);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list