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

- Renamed a few mult-variables to something more fitting

Browse source 
- Fixed a small mistake, making the entering animation work
- Correcting Game_v2::playTot() so that the loading screen is shown
- Updated most of the collisions stuff, the objects names hint stuff works now

svn-id: r23346
This commit is contained in:
Sven Hesse 2006-06-29 12:55:57 +00:00
parent 221afd715a
commit 27a8b8a255
9 changed files with 1675 additions and 889 deletions
Download patch file Download diff file Expand all files Collapse all files

748
engines/gob/game.cpp
View file

@ -250,65 +250,6 @@ void Game::freeCollision(int16 id) {
} }
} }
int16 Game::checkMousePoint(int16 all, int16 *resId, int16 *resIndex) {
Collision *ptr;
int16 i;
if (resId != 0)
*resId = 0;
*resIndex = 0;
ptr = _collisionAreas;
for (i = 0; ptr->left != -1; ptr++, i++) {
if (all) {
if ((ptr->flags & 0xf) > 1)
continue;
if ((ptr->flags & 0xff00) != 0)
continue;
if (_vm->_global->_inter_mouseX < ptr->left
|| _vm->_global->_inter_mouseX > ptr->right
|| _vm->_global->_inter_mouseY < ptr->top
|| _vm->_global->_inter_mouseY > ptr->bottom)
continue;
if (resId != 0)
*resId = ptr->id;
*resIndex = i;
return ptr->key;
} else {
if ((ptr->flags & 0xff00) != 0)
continue;
if ((ptr->flags & 0xf) != 1 && (ptr->flags & 0xf) != 2)
continue;
if ((ptr->flags & 0xf0) >> 4 != _mouseButtons - 1
&& (ptr->flags & 0xf0) >> 4 != 2)
continue;
if (_vm->_global->_inter_mouseX < ptr->left
|| _vm->_global->_inter_mouseX > ptr->right
|| _vm->_global->_inter_mouseY < ptr->top
|| _vm->_global->_inter_mouseY > ptr->bottom)
continue;
if (resId != 0)
*resId = ptr->id;
*resIndex = i;
return ptr->key;
}
}
if (_mouseButtons != 1 && all == 0)
return 0x11b;
return 0;
}
void Game::capturePush(int16 left, int16 top, int16 width, int16 height) { void Game::capturePush(int16 left, int16 top, int16 width, int16 height) {
int16 right; int16 right;
@ -654,169 +595,6 @@ int16 Game::inputArea(int16 xPos, int16 yPos, int16 width, int16 height, int16 b
} }
} }
int16 Game::multiEdit(int16 time, int16 index, int16 *pCurPos, InputDesc * inpDesc) {
Collision *collArea;
int16 descInd;
int16 key;
int16 found = -1;
int16 i;
descInd = 0;
for (i = 0; i < 250; i++) {
collArea = &_collisionAreas[i];
if (collArea->left == -1)
continue;
if ((collArea->id & 0x8000) == 0)
continue;
if ((collArea->flags & 0x0f) < 3)
continue;
if ((collArea->flags & 0x0f) > 10)
continue;
strcpy(_tempStr, _vm->_global->_inter_variables + collArea->key);
_vm->_draw->_destSpriteX = collArea->left;
_vm->_draw->_destSpriteY = collArea->top;
_vm->_draw->_spriteRight = collArea->right - collArea->left + 1;
_vm->_draw->_spriteBottom = collArea->bottom - collArea->top + 1;
_vm->_draw->_destSurface = 21;
_vm->_draw->_backColor = inpDesc[descInd].backColor;
_vm->_draw->_frontColor = inpDesc[descInd].frontColor;
_vm->_draw->_textToPrint = _tempStr;
_vm->_draw->_transparency = 1;
_vm->_draw->_fontIndex = inpDesc[descInd].fontIndex;
_vm->_draw->spriteOperation(DRAW_FILLRECT);
_vm->_draw->_destSpriteY +=
((collArea->bottom - collArea->top + 1) - 8) / 2;
_vm->_draw->spriteOperation(DRAW_PRINTTEXT);
descInd++;
}
for (i = 0; i < 40; i++) {
WRITE_VAR_OFFSET(i * 4 + 0x44, 0);
}
while (1) {
descInd = 0;
for (i = 0; i < 250; i++) {
collArea = &_collisionAreas[i];
if (collArea->left == -1)
continue;
if ((collArea->id & 0x8000) == 0)
continue;
if ((collArea->flags & 0x0f) < 3)
continue;
if ((collArea->flags & 0x0f) > 10)
continue;
if (descInd == *pCurPos) {
found = i;
break;
}
descInd++;
}
assert(found != -1);
collArea = &_collisionAreas[found];
key = inputArea(collArea->left, collArea->top,
collArea->right - collArea->left + 1,
collArea->bottom - collArea->top + 1,
inpDesc[*pCurPos].backColor, inpDesc[*pCurPos].frontColor,
_vm->_global->_inter_variables + collArea->key,
inpDesc[*pCurPos].fontIndex, collArea->flags, &time);
if (_vm->_inter->_terminate)
return 0;
switch (key) {
case 0:
if (_activeCollResId == 0)
return 0;
if ((_collisionAreas[_activeCollIndex].
flags & 0x0f) < 3)
return 0;
if ((_collisionAreas[_activeCollIndex].
flags & 0x0f) > 10)
return 0;
*pCurPos = 0;
for (i = 0; i < 250; i++) {
collArea = &_collisionAreas[i];
if (collArea->left == -1)
continue;
if ((collArea->id & 0x8000) == 0)
continue;
if ((collArea->flags & 0x0f) < 3)
continue;
if ((collArea->flags & 0x0f) > 10)
continue;
if (i == _activeCollIndex)
break;
pCurPos[0]++;
}
break;
case 0x3b00:
case 0x3c00:
case 0x3d00:
case 0x3e00:
case 0x3f00:
case 0x4000:
case 0x4100:
case 0x4200:
case 0x4300:
case 0x4400:
return key;
case 0x1c0d:
if (index == 1)
return key;
if (*pCurPos == index - 1) {
*pCurPos = 0;
break;
}
pCurPos[0]++;
break;
case 0x5000:
if (index - 1 > *pCurPos)
pCurPos[0]++;
break;
case 0x4800:
if (*pCurPos > 0)
pCurPos[0]--;
break;
}
}
}
int16 Game::adjustKey(int16 key) { int16 Game::adjustKey(int16 key) {
if (key <= 0x60 || key >= 0x7b) if (key <= 0x60 || key >= 0x7b)
return key; return key;
@ -824,522 +602,6 @@ int16 Game::adjustKey(int16 key) {
return key - 0x20; return key - 0x20;
} }
void Game::collisionsBlock(void) {
InputDesc descArray[20];
int16 array[250];
char count;
int16 collResId;
char *startIP;
int16 curCmd;
int16 cmd;
int16 cmdHigh;
int16 key;
int16 flags;
int16 left;
int16 top;
int16 width;
int16 height;
int16 var_22;
int16 index;
int16 curEditIndex;
int16 deltaTime;
int16 descIndex2;
int16 stackPos2;
int16 descIndex;
int16 timeVal;
char *str;
int16 savedCollStackSize;
int16 i;
int16 counter;
int16 var_24;
int16 var_26;
int16 _collStackPos;
Collision *collPtr;
int16 timeKey;
char *savedIP;
if (_shouldPushColls)
pushCollisions(1);
collResId = -1;
_vm->_global->_inter_execPtr++;
count = *_vm->_global->_inter_execPtr++;
_handleMouse = _vm->_global->_inter_execPtr[0];
deltaTime = 1000 * (byte)_vm->_global->_inter_execPtr[1];
descIndex2 = (byte)_vm->_global->_inter_execPtr[2];
stackPos2 = (byte)_vm->_global->_inter_execPtr[3];
descIndex = (byte)_vm->_global->_inter_execPtr[4];
if (stackPos2 != 0 || descIndex != 0)
deltaTime /= 100;
timeVal = deltaTime;
_vm->_global->_inter_execPtr += 6;
startIP = _vm->_global->_inter_execPtr;
WRITE_VAR(16, 0);
var_22 = 0;
index = 0;
curEditIndex = 0;
for (curCmd = 0; curCmd < count; curCmd++) {
array[curCmd] = 0;
cmd = *_vm->_global->_inter_execPtr++;
if ((cmd & 0x40) != 0) {
cmd -= 0x40;
cmdHigh = (byte)*_vm->_global->_inter_execPtr;
_vm->_global->_inter_execPtr++;
cmdHigh <<= 8;
} else {
cmdHigh = 0;
}
if ((cmd & 0x80) != 0) {
left = _vm->_parse->parseValExpr();
top = _vm->_parse->parseValExpr();
width = _vm->_parse->parseValExpr();
height = _vm->_parse->parseValExpr();
} else {
left = _vm->_inter->load16();
top = _vm->_inter->load16();
width = _vm->_inter->load16();
height = _vm->_inter->load16();
}
cmd &= 0x7f;
debugC(1, DEBUG_COLLISIONS, "collisionsBlock(%d)", cmd);
switch (cmd) {
case 3:
case 4:
case 5:
case 6:
case 7:
case 8:
case 9:
case 10:
_vm->_util->waitKey();
var_22 = 1;
key = _vm->_parse->parseVarIndex();
descArray[index].fontIndex = _vm->_inter->load16();
descArray[index].backColor = *_vm->_global->_inter_execPtr++;
descArray[index].frontColor = *_vm->_global->_inter_execPtr++;
if (cmd < 5 || cmd > 8) {
descArray[index].ptr = 0;
} else {
descArray[index].ptr = _vm->_global->_inter_execPtr + 2;
_vm->_global->_inter_execPtr += _vm->_inter->load16();
}
if (left == -1)
break;
if ((cmd & 1) == 0) {
addNewCollision(curCmd + 0x8000, left,
top,
left +
width *
_vm->_draw->_fonts[descArray[index].fontIndex]->
itemWidth - 1, top + height - 1, cmd, key,
0,
_vm->_global->_inter_execPtr - (char *)_totFileData);
_vm->_global->_inter_execPtr += 2;
_vm->_global->_inter_execPtr += READ_LE_UINT16(_vm->_global->_inter_execPtr);
} else {
addNewCollision(curCmd + 0x8000, left,
top,
left +
width *
_vm->_draw->_fonts[descArray[index].fontIndex]->
itemWidth - 1, top + height - 1, cmd, key,
0, 0);
}
index++;
break;
case 21:
key = _vm->_inter->load16();
array[curCmd] = _vm->_inter->load16();
flags = _vm->_inter->load16() & 3;
addNewCollision(curCmd + 0x8000, left, top,
left + width - 1,
top + height - 1,
(flags << 4) + cmdHigh + 2, key,
_vm->_global->_inter_execPtr - (char *)_totFileData, 0);
_vm->_global->_inter_execPtr += 2;
_vm->_global->_inter_execPtr += READ_LE_UINT16(_vm->_global->_inter_execPtr);
break;
case 20:
collResId = curCmd;
// Fall through to case 2
case 2:
key = _vm->_inter->load16();
array[curCmd] = _vm->_inter->load16();
flags = _vm->_inter->load16() & 3;
addNewCollision(curCmd + 0x8000, left, top,
left + width - 1,
top + height - 1,
(flags << 4) + cmdHigh + 2, key, 0,
_vm->_global->_inter_execPtr - (char *)_totFileData);
_vm->_global->_inter_execPtr += 2;
_vm->_global->_inter_execPtr += READ_LE_UINT16(_vm->_global->_inter_execPtr);
break;
case 0:
_vm->_global->_inter_execPtr += 6;
startIP = _vm->_global->_inter_execPtr;
_vm->_global->_inter_execPtr += 2;
_vm->_global->_inter_execPtr += READ_LE_UINT16(_vm->_global->_inter_execPtr);
key = curCmd + 0xA000;
addNewCollision(curCmd + 0x8000, left, top,
left + width - 1,
top + height - 1,
cmd + cmdHigh, key,
startIP - (char *)_totFileData,
_vm->_global->_inter_execPtr - (char *)_totFileData);
_vm->_global->_inter_execPtr += 2;
_vm->_global->_inter_execPtr += READ_LE_UINT16(_vm->_global->_inter_execPtr);
break;
case 1:
key = _vm->_inter->load16();
array[curCmd] = _vm->_inter->load16();
flags = _vm->_inter->load16() & 3;
startIP = _vm->_global->_inter_execPtr;
_vm->_global->_inter_execPtr += 2;
_vm->_global->_inter_execPtr += READ_LE_UINT16(_vm->_global->_inter_execPtr);
if (key == 0)
key = curCmd + 0xa000;
addNewCollision(curCmd + 0x8000, left, top,
left + width - 1,
top + height - 1,
(flags << 4) + cmd + cmdHigh, key,
startIP - (char *)_totFileData,
_vm->_global->_inter_execPtr - (char *)_totFileData);
_vm->_global->_inter_execPtr += 2;
_vm->_global->_inter_execPtr += READ_LE_UINT16(_vm->_global->_inter_execPtr);
break;
}
}
_forceHandleMouse = 0;
_vm->_util->waitKey();
do {
if (var_22 != 0) {
key =
multiEdit(deltaTime, index, &curEditIndex,
descArray);
if (key == 0x1c0d) {
for (i = 0; i < 250; i++) {
if (_collisionAreas[i].left == -1)
continue;
if ((_collisionAreas[i].id & 0x8000) == 0)
continue;
if ((_collisionAreas[i].flags & 1) != 0)
continue;
if ((_collisionAreas[i].flags & 0x0f) <= 2)
continue;
collResId = _collisionAreas[i].id;
_activeCollResId = collResId;
collResId &= 0x7fff;
_activeCollIndex = i;
break;
}
break;
}
} else {
key =
checkCollisions(_handleMouse, -deltaTime,
&_activeCollResId, &_activeCollIndex);
}
if ((key & 0xff) >= ' ' && (key & 0xff) <= 0xff &&
(key >> 8) > 1 && (key >> 8) < 12) {
key = '0' + (((key >> 8) - 1) % 10) + (key & 0xff00);
}
if (_activeCollResId == 0) {
if (key != 0) {
for (i = 0; i < 250; i++) {
if (_collisionAreas[i].left == -1)
continue;
if ((_collisionAreas[i].
id & 0x8000) == 0)
continue;
if (_collisionAreas[i].key == key
|| _collisionAreas[i].key ==
0x7fff) {
_activeCollResId =
_collisionAreas[i].id;
_activeCollIndex = i;
break;
}
}
if (_activeCollResId == 0) {
for (i = 0; i < 250; i++) {
if (_collisionAreas[i].left == -1)
continue;
if ((_collisionAreas[i].id & 0x8000) == 0)
continue;
if ((_collisionAreas[i].key & 0xff00) != 0)
continue;
if (_collisionAreas[i].key == 0)
continue;
if (adjustKey(key & 0xff) == adjustKey(_collisionAreas[i].key) || _collisionAreas[i].key == 0x7fff) {
_activeCollResId = _collisionAreas[i].id;
_activeCollIndex = i;
break;
}
}
}
} else {
if (deltaTime != 0 && VAR(16) == 0) {
if (stackPos2 != 0) {
_collStackPos = 0;
collPtr = _collisionAreas;
for (i = 0, collPtr = _collisionAreas; collPtr->left != -1; i++, collPtr++) {
if ((collPtr->id & 0x8000) == 0)
continue;
_collStackPos++;
if (_collStackPos != stackPos2)
continue;
_activeCollResId = collPtr->id;
_activeCollIndex = i;
WRITE_VAR(2, _vm->_global->_inter_mouseX);
WRITE_VAR(3, _vm->_global->_inter_mouseY);
WRITE_VAR(4, _mouseButtons);
WRITE_VAR(16, array[(uint16)_activeCollResId & ~0x8000]);
if (collPtr->funcLeave != 0) {
timeKey = _vm->_util->getTimeKey();
savedIP = _vm->_global->_inter_execPtr;
_vm->_global->_inter_execPtr = (char *)_totFileData + collPtr->funcLeave;
_shouldPushColls = 1;
savedCollStackSize = _collStackSize;
_vm->_inter->funcBlock(0);
if (savedCollStackSize != _collStackSize)
popCollisions();
_shouldPushColls = 0;
_vm->_global->_inter_execPtr = savedIP;
deltaTime = timeVal - (_vm->_util->getTimeKey() - timeKey);
if (deltaTime < 2)
deltaTime = 2;
}
if (VAR(16) == 0)
_activeCollResId = 0;
break;
}
} else {
if (descIndex != 0) {
counter = 0;
for (i = 0; i < 250; i++) {
if (_collisionAreas[i].left == -1)
continue;
if ((_collisionAreas[i].id & 0x8000) == 0)
continue;
counter++;
if (counter != descIndex)
continue;
_activeCollResId = _collisionAreas[i].id;
_activeCollIndex = i;
break;
}
} else {
for (i = 0; i < 250; i++) {
if (_collisionAreas[i].left == -1)
continue;
if ((_collisionAreas[i].id & 0x8000) == 0)
continue;
_activeCollResId = _collisionAreas[i].id;
_activeCollIndex = i;
break;
}
}
}
} else {
if (descIndex2 != 0) {
counter = 0;
for (i = 0; i < 250; i++) {
if (_collisionAreas[i].left == -1)
continue;
if ((_collisionAreas[i].id & 0x8000) == 0)
continue;
counter++;
if (counter != descIndex2)
continue;
_activeCollResId = _collisionAreas[i].id;
_activeCollIndex = i;
break;
}
}
}
}
}
if (_activeCollResId == 0)
continue;
if (_collisionAreas[_activeCollIndex].funcLeave != 0)
continue;
WRITE_VAR(2, _vm->_global->_inter_mouseX);
WRITE_VAR(3, _vm->_global->_inter_mouseY);
WRITE_VAR(4, _mouseButtons);
WRITE_VAR(16, array[(uint16)_activeCollResId & ~0x8000]);
if (_collisionAreas[_activeCollIndex].funcEnter != 0) {
savedIP = _vm->_global->_inter_execPtr;
_vm->_global->_inter_execPtr = (char *)_totFileData +
_collisionAreas[_activeCollIndex].
funcEnter;
_shouldPushColls = 1;
_collStackPos = _collStackSize;
_vm->_inter->funcBlock(0);
if (_collStackPos != _collStackSize)
popCollisions();
_shouldPushColls = 0;
_vm->_global->_inter_execPtr = savedIP;
}
WRITE_VAR(16, 0);
_activeCollResId = 0;
}
while (_activeCollResId == 0 && !_vm->_inter->_terminate && !_vm->_quitRequested);
if (((uint16)_activeCollResId & ~0x8000) == collResId) {
_collStackPos = 0;
var_24 = 0;
var_26 = 1;
for (i = 0; i < 250; i++) {
if (_collisionAreas[i].left == -1)
continue;
if ((_collisionAreas[i].id & 0x8000) == 0)
continue;
if ((_collisionAreas[i].flags & 0x0f) < 3)
continue;
if ((_collisionAreas[i].flags & 0x0f) > 10)
continue;
if ((_collisionAreas[i].flags & 0x0f) > 8) {
char *ptr;
strcpy(_tempStr,
_vm->_global->_inter_variables + _collisionAreas[i].key);
while ((ptr = strchr(_tempStr, ' ')) != 0) {
_vm->_util->cutFromStr(_tempStr, (ptr - _tempStr), 1);
ptr = strchr(_tempStr, ' ');
}
strcpy(_vm->_global->_inter_variables + _collisionAreas[i].key, _tempStr);
}
if ((_collisionAreas[i].flags & 0x0f) >= 5 &&
(_collisionAreas[i].flags & 0x0f) <= 8) {
str = descArray[var_24].ptr;
strcpy(_tempStr, _vm->_global->_inter_variables + _collisionAreas[i].key);
if ((_collisionAreas[i].flags & 0x0f) < 7)
_vm->_util->prepareStr(_tempStr);
int16 pos = 0;
do {
strcpy(_collStr, str);
pos += strlen(str) + 1;
str += strlen(str) + 1;
if ((_collisionAreas[i].flags & 0x0f) < 7)
_vm->_util->prepareStr(_collStr);
if (strcmp(_tempStr, _collStr) == 0) {
VAR(17)++;
WRITE_VAR(17 + var_26, 1);
break;
}
} while (READ_LE_UINT16(descArray[var_24].ptr - 2) > pos);
_collStackPos++;
} else {
VAR(17 + var_26) = 2;
}
var_24++;
var_26++;
}
if (_collStackPos != (int16)VAR(17))
WRITE_VAR(17, 0);
else
WRITE_VAR(17, 1);
}
savedIP = 0;
if (!_vm->_inter->_terminate) {
savedIP = (char *)_totFileData +
_collisionAreas[_activeCollIndex].funcLeave;
WRITE_VAR(2, _vm->_global->_inter_mouseX);
WRITE_VAR(3, _vm->_global->_inter_mouseY);
WRITE_VAR(4, _mouseButtons);
if (VAR(16) == 0) {
WRITE_VAR(16, array[(uint16)_activeCollResId & ~0x8000]);
}
}
for (curCmd = 0; curCmd < count; curCmd++) {
freeCollision(curCmd + 0x8000);
}
_vm->_global->_inter_execPtr = savedIP;
}
void Game::loadTotFile(char *path) { void Game::loadTotFile(char *path) {
int16 handle; int16 handle;
@ -1408,7 +670,7 @@ void Game::loadImFile(void) {
void Game::start(void) { void Game::start(void) {
_collisionAreas = new Collision[250]; _collisionAreas = new Collision[250];
prepareStart(); prepareStart();
playTot(0); playTot(-2);
delete[] _collisionAreas; delete[] _collisionAreas;
@ -1634,7 +896,7 @@ void Game::setCollisions(void) {
top = _vm->_parse->parseValExpr(); top = _vm->_parse->parseValExpr();
width = _vm->_parse->parseValExpr(); width = _vm->_parse->parseValExpr();
height = _vm->_parse->parseValExpr(); height = _vm->_parse->parseValExpr();
if ((_vm->_draw->_renderFlags != 8) && (left != -1)) { if ((_vm->_draw->_renderFlags & 8) && (left != -1)) {
left += _vm->_draw->_backDeltaX; left += _vm->_draw->_backDeltaX;
top += _vm->_draw->_backDeltaY; top += _vm->_draw->_backDeltaY;
} }
@ -1680,12 +942,12 @@ void Game::collAreaSub(int16 index, int8 enter) {
collId = _collisionAreas[index].id & 0xF000; collId = _collisionAreas[index].id & 0xF000;
if ((collId == 0xA000) || (collId == 0x9000)) if ((collId != 0xA000) && (collId != 0x9000))
WRITE_VAR(17, collId); WRITE_VAR(17, collId);
else if (enter == 0) else if (enter == 0)
WRITE_VAR(17, -(collId & 0x0FFF)); WRITE_VAR(17, _collisionAreas[index].id & 0x0FFF);
else else
WRITE_VAR(17, collId & 0x0FFF); WRITE_VAR(17, -(_collisionAreas[index].id & 0x0FFF));
if (enter != 0) { if (enter != 0) {
if (_collisionAreas[index].funcEnter != 0) if (_collisionAreas[index].funcEnter != 0)

16
engines/gob/game.h
View file

@ -195,10 +195,7 @@ public:
void loadSound(int16 slot, char *dataPtr); void loadSound(int16 slot, char *dataPtr);
int16 inputArea(int16 xPos, int16 yPos, int16 width, int16 height, int16 backColor, int16 inputArea(int16 xPos, int16 yPos, int16 width, int16 height, int16 backColor,
int16 frontColor, char *str, int16 fontIndex, char inpType, int16 *pTotTime); int16 frontColor, char *str, int16 fontIndex, char inpType, int16 *pTotTime);
int16 multiEdit(int16 time, int16 index, int16 *pCurPos,
InputDesc * inpDesc);
int16 adjustKey(int16 key); int16 adjustKey(int16 key);
void collisionsBlock(void);
void loadTotFile(char *path); void loadTotFile(char *path);
void loadExtTable(void); void loadExtTable(void);
void loadImFile(void); void loadImFile(void);
@ -224,6 +221,9 @@ public:
virtual void clearCollisions(void) = 0; virtual void clearCollisions(void) = 0;
virtual void addNewCollision(int16 id, int16 left, int16 top, int16 right, virtual void addNewCollision(int16 id, int16 left, int16 top, int16 right,
int16 bottom, int16 flags, int16 key, int16 funcEnter, int16 funcLeave) = 0; int16 bottom, int16 flags, int16 key, int16 funcEnter, int16 funcLeave) = 0;
virtual void collisionsBlock(void) = 0;
virtual int16 multiEdit(int16 time, int16 index, int16 *pCurPos,
InputDesc *inpDesc, int16 *collResId, int16 *collIndex) = 0;
virtual int16 checkKeys(int16 *pMousex, int16 *pMouseY, int16 *pButtons, virtual int16 checkKeys(int16 *pMousex, int16 *pMouseY, int16 *pButtons,
char handleMouse) = 0; char handleMouse) = 0;
virtual int16 checkCollisions(char handleMouse, int16 deltaTime, int16 *pResId, virtual int16 checkCollisions(char handleMouse, int16 deltaTime, int16 *pResId,
@ -269,7 +269,6 @@ protected:
GobEngine *_vm; GobEngine *_vm;
int16 checkMousePoint(int16 all, int16 *resId, int16 *resIndex);
void setCollisions(void); void setCollisions(void);
void collSub(int16 offset); void collSub(int16 offset);
void collAreaSub(int16 index, int8 enter); void collAreaSub(int16 index, int8 enter);
@ -277,6 +276,7 @@ protected:
virtual void pushCollisions(char all) = 0; virtual void pushCollisions(char all) = 0;
virtual void popCollisions(void) = 0; virtual void popCollisions(void) = 0;
virtual int16 checkMousePoint(int16 all, int16 *resId, int16 *resIndex) = 0;
}; };
class Game_v1 : public Game { class Game_v1 : public Game {
@ -285,6 +285,9 @@ public:
virtual void clearCollisions(void); virtual void clearCollisions(void);
virtual void addNewCollision(int16 id, int16 left, int16 top, int16 right, virtual void addNewCollision(int16 id, int16 left, int16 top, int16 right,
int16 bottom, int16 flags, int16 key, int16 funcEnter, int16 funcLeave); int16 bottom, int16 flags, int16 key, int16 funcEnter, int16 funcLeave);
virtual void collisionsBlock(void);
virtual int16 multiEdit(int16 time, int16 index, int16 *pCurPos,
InputDesc *inpDesc, int16 *collResId, int16 *collIndex);
virtual int16 checkKeys(int16 *pMousex, int16 *pMouseY, int16 *pButtons, virtual int16 checkKeys(int16 *pMousex, int16 *pMouseY, int16 *pButtons,
char handleMouse); char handleMouse);
virtual int16 checkCollisions(char handleMouse, int16 deltaTime, int16 *pResId, virtual int16 checkCollisions(char handleMouse, int16 deltaTime, int16 *pResId,
@ -297,6 +300,7 @@ public:
protected: protected:
virtual void pushCollisions(char all); virtual void pushCollisions(char all);
virtual void popCollisions(void); virtual void popCollisions(void);
virtual int16 checkMousePoint(int16 all, int16 *resId, int16 *resIndex);
}; };
class Game_v2 : public Game_v1 { class Game_v2 : public Game_v1 {
@ -305,6 +309,9 @@ public:
virtual void clearCollisions(void); virtual void clearCollisions(void);
virtual void addNewCollision(int16 id, int16 left, int16 top, int16 right, virtual void addNewCollision(int16 id, int16 left, int16 top, int16 right,
int16 bottom, int16 flags, int16 key, int16 funcEnter, int16 funcLeave); int16 bottom, int16 flags, int16 key, int16 funcEnter, int16 funcLeave);
virtual void collisionsBlock(void);
virtual int16 multiEdit(int16 time, int16 index, int16 *pCurPos,
InputDesc *inpDesc, int16 *collResId, int16 *collIndex);
virtual int16 checkKeys(int16 *pMousex, int16 *pMouseY, int16 *pButtons, virtual int16 checkKeys(int16 *pMousex, int16 *pMouseY, int16 *pButtons,
char handleMouse); char handleMouse);
virtual int16 checkCollisions(char handleMouse, int16 deltaTime, int16 *pResId, virtual int16 checkCollisions(char handleMouse, int16 deltaTime, int16 *pResId,
@ -325,6 +332,7 @@ protected:
virtual void pushCollisions(char all); virtual void pushCollisions(char all);
virtual void popCollisions(void); virtual void popCollisions(void);
virtual int16 checkMousePoint(int16 all, int16 *resId, int16 *resIndex);
}; };
} // End of namespace Gob } // End of namespace Gob

744
engines/gob/game_v1.cpp
View file

@ -59,6 +59,9 @@ void Game_v1::playTot(int16 skipPlay) {
char *savedIP; char *savedIP;
int16 i; int16 i;
if (skipPlay < 0)
skipPlay = 0;
oldNestLevel = _vm->_inter->_nestLevel; oldNestLevel = _vm->_inter->_nestLevel;
oldBreakFrom = _vm->_inter->_breakFromLevel; oldBreakFrom = _vm->_inter->_breakFromLevel;
oldCaptureCounter = _vm->_scenery->_pCaptureCounter; oldCaptureCounter = _vm->_scenery->_pCaptureCounter;
@ -83,7 +86,7 @@ void Game_v1::playTot(int16 skipPlay) {
else else
_vm->_cdrom->stopPlaying(); _vm->_cdrom->stopPlaying();
_vm->_draw->animateCursor(4); _vm->_draw->animateCursor(4);
_vm->_inter->initControlVars(); _vm->_inter->initControlVars(1);
_vm->_mult->initAll(); _vm->_mult->initAll();
_vm->_mult->zeroMultData(); _vm->_mult->zeroMultData();
@ -627,4 +630,743 @@ void Game_v1::prepareStart(void) {
_startTimeKey = _vm->_util->getTimeKey(); _startTimeKey = _vm->_util->getTimeKey();
} }
void Game_v1::collisionsBlock(void) {
InputDesc descArray[20];
int16 array[250];
char count;
int16 collResId;
char *startIP;
int16 curCmd;
int16 cmd;
int16 cmdHigh;
int16 key;
int16 flags;
int16 left;
int16 top;
int16 width;
int16 height;
int16 var_22;
int16 index;
int16 curEditIndex;
int16 deltaTime;
int16 descIndex2;
int16 stackPos2;
int16 descIndex;
int16 timeVal;
char *str;
int16 savedCollStackSize;
int16 i;
int16 counter;
int16 var_24;
int16 var_26;
int16 _collStackPos;
Collision *collPtr;
int16 timeKey;
char *savedIP;
if (_shouldPushColls)
pushCollisions(1);
collResId = -1;
_vm->_global->_inter_execPtr++;
count = *_vm->_global->_inter_execPtr++;
_handleMouse = _vm->_global->_inter_execPtr[0];
deltaTime = 1000 * (byte)_vm->_global->_inter_execPtr[1];
descIndex2 = (byte)_vm->_global->_inter_execPtr[2];
stackPos2 = (byte)_vm->_global->_inter_execPtr[3];
descIndex = (byte)_vm->_global->_inter_execPtr[4];
if (stackPos2 != 0 || descIndex != 0)
deltaTime /= 100;
timeVal = deltaTime;
_vm->_global->_inter_execPtr += 6;
startIP = _vm->_global->_inter_execPtr;
WRITE_VAR(16, 0);
var_22 = 0;
index = 0;
curEditIndex = 0;
for (curCmd = 0; curCmd < count; curCmd++) {
array[curCmd] = 0;
cmd = *_vm->_global->_inter_execPtr++;
if ((cmd & 0x40) != 0) {
cmd -= 0x40;
cmdHigh = (byte)*_vm->_global->_inter_execPtr;
_vm->_global->_inter_execPtr++;
cmdHigh <<= 8;
} else {
cmdHigh = 0;
}
if ((cmd & 0x80) != 0) {
left = _vm->_parse->parseValExpr();
top = _vm->_parse->parseValExpr();
width = _vm->_parse->parseValExpr();
height = _vm->_parse->parseValExpr();
} else {
left = _vm->_inter->load16();
top = _vm->_inter->load16();
width = _vm->_inter->load16();
height = _vm->_inter->load16();
}
cmd &= 0x7f;
debugC(1, DEBUG_COLLISIONS, "collisionsBlock(%d)", cmd);
switch (cmd) {
case 3:
case 4:
case 5:
case 6:
case 7:
case 8:
case 9:
case 10:
_vm->_util->waitKey();
var_22 = 1;
key = _vm->_parse->parseVarIndex();
descArray[index].fontIndex = _vm->_inter->load16();
descArray[index].backColor = *_vm->_global->_inter_execPtr++;
descArray[index].frontColor = *_vm->_global->_inter_execPtr++;
if (cmd < 5 || cmd > 8) {
descArray[index].ptr = 0;
} else {
descArray[index].ptr = _vm->_global->_inter_execPtr + 2;
_vm->_global->_inter_execPtr += _vm->_inter->load16();
}
if (left == -1)
break;
if ((cmd & 1) == 0) {
addNewCollision(curCmd + 0x8000, left,
top,
left +
width *
_vm->_draw->_fonts[descArray[index].fontIndex]->
itemWidth - 1, top + height - 1, cmd, key,
0,
_vm->_global->_inter_execPtr - (char *)_totFileData);
_vm->_global->_inter_execPtr += 2;
_vm->_global->_inter_execPtr += READ_LE_UINT16(_vm->_global->_inter_execPtr);
} else {
addNewCollision(curCmd + 0x8000, left,
top,
left +
width *
_vm->_draw->_fonts[descArray[index].fontIndex]->
itemWidth - 1, top + height - 1, cmd, key,
0, 0);
}
index++;
break;
case 21:
key = _vm->_inter->load16();
array[curCmd] = _vm->_inter->load16();
flags = _vm->_inter->load16() & 3;
addNewCollision(curCmd + 0x8000, left, top,
left + width - 1,
top + height - 1,
(flags << 4) + cmdHigh + 2, key,
_vm->_global->_inter_execPtr - (char *)_totFileData, 0);
_vm->_global->_inter_execPtr += 2;
_vm->_global->_inter_execPtr += READ_LE_UINT16(_vm->_global->_inter_execPtr);
break;
case 20:
collResId = curCmd;
// Fall through to case 2
case 2:
key = _vm->_inter->load16();
array[curCmd] = _vm->_inter->load16();
flags = _vm->_inter->load16() & 3;
addNewCollision(curCmd + 0x8000, left, top,
left + width - 1,
top + height - 1,
(flags << 4) + cmdHigh + 2, key, 0,
_vm->_global->_inter_execPtr - (char *)_totFileData);
_vm->_global->_inter_execPtr += 2;
_vm->_global->_inter_execPtr += READ_LE_UINT16(_vm->_global->_inter_execPtr);
break;
case 0:
_vm->_global->_inter_execPtr += 6;
startIP = _vm->_global->_inter_execPtr;
_vm->_global->_inter_execPtr += 2;
_vm->_global->_inter_execPtr += READ_LE_UINT16(_vm->_global->_inter_execPtr);
key = curCmd + 0xA000;
addNewCollision(curCmd + 0x8000, left, top,
left + width - 1,
top + height - 1,
cmd + cmdHigh, key,
startIP - (char *)_totFileData,
_vm->_global->_inter_execPtr - (char *)_totFileData);
_vm->_global->_inter_execPtr += 2;
_vm->_global->_inter_execPtr += READ_LE_UINT16(_vm->_global->_inter_execPtr);
break;
case 1:
key = _vm->_inter->load16();
array[curCmd] = _vm->_inter->load16();
flags = _vm->_inter->load16() & 3;
startIP = _vm->_global->_inter_execPtr;
_vm->_global->_inter_execPtr += 2;
_vm->_global->_inter_execPtr += READ_LE_UINT16(_vm->_global->_inter_execPtr);
if (key == 0)
key = curCmd + 0xa000;
addNewCollision(curCmd + 0x8000, left, top,
left + width - 1,
top + height - 1,
(flags << 4) + cmd + cmdHigh, key,
startIP - (char *)_totFileData,
_vm->_global->_inter_execPtr - (char *)_totFileData);
_vm->_global->_inter_execPtr += 2;
_vm->_global->_inter_execPtr += READ_LE_UINT16(_vm->_global->_inter_execPtr);
break;
}
}
_forceHandleMouse = 0;
_vm->_util->waitKey();
do {
if (var_22 != 0) {
key =
multiEdit(deltaTime, index, &curEditIndex,
descArray, 0, 0);
if (key == 0x1c0d) {
for (i = 0; i < 250; i++) {
if (_collisionAreas[i].left == -1)
continue;
if ((_collisionAreas[i].id & 0x8000) == 0)
continue;
if ((_collisionAreas[i].flags & 1) != 0)
continue;
if ((_collisionAreas[i].flags & 0x0f) <= 2)
continue;
collResId = _collisionAreas[i].id;
_activeCollResId = collResId;
collResId &= 0x7fff;
_activeCollIndex = i;
break;
}
break;
}
} else {
key =
checkCollisions(_handleMouse, -deltaTime,
&_activeCollResId, &_activeCollIndex);
}
if ((key & 0xff) >= ' ' && (key & 0xff) <= 0xff &&
(key >> 8) > 1 && (key >> 8) < 12) {
key = '0' + (((key >> 8) - 1) % 10) + (key & 0xff00);
}
if (_activeCollResId == 0) {
if (key != 0) {
for (i = 0; i < 250; i++) {
if (_collisionAreas[i].left == -1)
continue;
if ((_collisionAreas[i].
id & 0x8000) == 0)
continue;
if (_collisionAreas[i].key == key
|| _collisionAreas[i].key ==
0x7fff) {
_activeCollResId =
_collisionAreas[i].id;
_activeCollIndex = i;
break;
}
}
if (_activeCollResId == 0) {
for (i = 0; i < 250; i++) {
if (_collisionAreas[i].left == -1)
continue;
if ((_collisionAreas[i].id & 0x8000) == 0)
continue;
if ((_collisionAreas[i].key & 0xff00) != 0)
continue;
if (_collisionAreas[i].key == 0)
continue;
if (adjustKey(key & 0xff) == adjustKey(_collisionAreas[i].key) || _collisionAreas[i].key == 0x7fff) {
_activeCollResId = _collisionAreas[i].id;
_activeCollIndex = i;
break;
}
}
}
} else {
if (deltaTime != 0 && VAR(16) == 0) {
if (stackPos2 != 0) {
_collStackPos = 0;
collPtr = _collisionAreas;
for (i = 0, collPtr = _collisionAreas; collPtr->left != -1; i++, collPtr++) {
if ((collPtr->id & 0x8000) == 0)
continue;
_collStackPos++;
if (_collStackPos != stackPos2)
continue;
_activeCollResId = collPtr->id;
_activeCollIndex = i;
WRITE_VAR(2, _vm->_global->_inter_mouseX);
WRITE_VAR(3, _vm->_global->_inter_mouseY);
WRITE_VAR(4, _mouseButtons);
WRITE_VAR(16, array[(uint16)_activeCollResId & ~0x8000]);
if (collPtr->funcLeave != 0) {
timeKey = _vm->_util->getTimeKey();
savedIP = _vm->_global->_inter_execPtr;
_vm->_global->_inter_execPtr = (char *)_totFileData + collPtr->funcLeave;
_shouldPushColls = 1;
savedCollStackSize = _collStackSize;
_vm->_inter->funcBlock(0);
if (savedCollStackSize != _collStackSize)
popCollisions();
_shouldPushColls = 0;
_vm->_global->_inter_execPtr = savedIP;
deltaTime = timeVal - (_vm->_util->getTimeKey() - timeKey);
if (deltaTime < 2)
deltaTime = 2;
}
if (VAR(16) == 0)
_activeCollResId = 0;
break;
}
} else {
if (descIndex != 0) {
counter = 0;
for (i = 0; i < 250; i++) {
if (_collisionAreas[i].left == -1)
continue;
if ((_collisionAreas[i].id & 0x8000) == 0)
continue;
counter++;
if (counter != descIndex)
continue;
_activeCollResId = _collisionAreas[i].id;
_activeCollIndex = i;
break;
}
} else {
for (i = 0; i < 250; i++) {
if (_collisionAreas[i].left == -1)
continue;
if ((_collisionAreas[i].id & 0x8000) == 0)
continue;
_activeCollResId = _collisionAreas[i].id;
_activeCollIndex = i;
break;
}
}
}
} else {
if (descIndex2 != 0) {
counter = 0;
for (i = 0; i < 250; i++) {
if (_collisionAreas[i].left == -1)
continue;
if ((_collisionAreas[i].id & 0x8000) == 0)
continue;
counter++;
if (counter != descIndex2)
continue;
_activeCollResId = _collisionAreas[i].id;
_activeCollIndex = i;
break;
}
}
}
}
}
if (_activeCollResId == 0)
continue;
if (_collisionAreas[_activeCollIndex].funcLeave != 0)
continue;
WRITE_VAR(2, _vm->_global->_inter_mouseX);
WRITE_VAR(3, _vm->_global->_inter_mouseY);
WRITE_VAR(4, _mouseButtons);
WRITE_VAR(16, array[(uint16)_activeCollResId & ~0x8000]);
if (_collisionAreas[_activeCollIndex].funcEnter != 0) {
savedIP = _vm->_global->_inter_execPtr;
_vm->_global->_inter_execPtr = (char *)_totFileData +
_collisionAreas[_activeCollIndex].
funcEnter;
_shouldPushColls = 1;
_collStackPos = _collStackSize;
_vm->_inter->funcBlock(0);
if (_collStackPos != _collStackSize)
popCollisions();
_shouldPushColls = 0;
_vm->_global->_inter_execPtr = savedIP;
}
WRITE_VAR(16, 0);
_activeCollResId = 0;
}
while (_activeCollResId == 0 && !_vm->_inter->_terminate && !_vm->_quitRequested);
if (((uint16)_activeCollResId & ~0x8000) == collResId) {
_collStackPos = 0;
var_24 = 0;
var_26 = 1;
for (i = 0; i < 250; i++) {
if (_collisionAreas[i].left == -1)
continue;
if ((_collisionAreas[i].id & 0x8000) == 0)
continue;
if ((_collisionAreas[i].flags & 0x0f) < 3)
continue;
if ((_collisionAreas[i].flags & 0x0f) > 10)
continue;
if ((_collisionAreas[i].flags & 0x0f) > 8) {
char *ptr;
strcpy(_tempStr,
_vm->_global->_inter_variables + _collisionAreas[i].key);
while ((ptr = strchr(_tempStr, ' ')) != 0) {
_vm->_util->cutFromStr(_tempStr, (ptr - _tempStr), 1);
ptr = strchr(_tempStr, ' ');
}
strcpy(_vm->_global->_inter_variables + _collisionAreas[i].key, _tempStr);
}
if ((_collisionAreas[i].flags & 0x0f) >= 5 &&
(_collisionAreas[i].flags & 0x0f) <= 8) {
str = descArray[var_24].ptr;
strcpy(_tempStr, _vm->_global->_inter_variables + _collisionAreas[i].key);
if ((_collisionAreas[i].flags & 0x0f) < 7)
_vm->_util->prepareStr(_tempStr);
int16 pos = 0;
do {
strcpy(_collStr, str);
pos += strlen(str) + 1;
str += strlen(str) + 1;
if ((_collisionAreas[i].flags & 0x0f) < 7)
_vm->_util->prepareStr(_collStr);
if (strcmp(_tempStr, _collStr) == 0) {
VAR(17)++;
WRITE_VAR(17 + var_26, 1);
break;
}
} while (READ_LE_UINT16(descArray[var_24].ptr - 2) > pos);
_collStackPos++;
} else {
VAR(17 + var_26) = 2;
}
var_24++;
var_26++;
}
if (_collStackPos != (int16)VAR(17))
WRITE_VAR(17, 0);
else
WRITE_VAR(17, 1);
}
savedIP = 0;
if (!_vm->_inter->_terminate) {
savedIP = (char *)_totFileData +
_collisionAreas[_activeCollIndex].funcLeave;
WRITE_VAR(2, _vm->_global->_inter_mouseX);
WRITE_VAR(3, _vm->_global->_inter_mouseY);
WRITE_VAR(4, _mouseButtons);
if (VAR(16) == 0) {
WRITE_VAR(16, array[(uint16)_activeCollResId & ~0x8000]);
}
}
for (curCmd = 0; curCmd < count; curCmd++) {
freeCollision(curCmd + 0x8000);
}
_vm->_global->_inter_execPtr = savedIP;
}
int16 Game_v1::multiEdit(int16 time, int16 index, int16 *pCurPos, InputDesc * inpDesc,
int16 *collResId, int16 *collIndex) {
Collision *collArea;
int16 descInd;
int16 key;
int16 found = -1;
int16 i;
descInd = 0;
for (i = 0; i < 250; i++) {
collArea = &_collisionAreas[i];
if (collArea->left == -1)
continue;
if ((collArea->id & 0x8000) == 0)
continue;
if ((collArea->flags & 0x0f) < 3)
continue;
if ((collArea->flags & 0x0f) > 10)
continue;
strcpy(_tempStr, _vm->_global->_inter_variables + collArea->key);
_vm->_draw->_destSpriteX = collArea->left;
_vm->_draw->_destSpriteY = collArea->top;
_vm->_draw->_spriteRight = collArea->right - collArea->left + 1;
_vm->_draw->_spriteBottom = collArea->bottom - collArea->top + 1;
_vm->_draw->_destSurface = 21;
_vm->_draw->_backColor = inpDesc[descInd].backColor;
_vm->_draw->_frontColor = inpDesc[descInd].frontColor;
_vm->_draw->_textToPrint = _tempStr;
_vm->_draw->_transparency = 1;
_vm->_draw->_fontIndex = inpDesc[descInd].fontIndex;
_vm->_draw->spriteOperation(DRAW_FILLRECT);
_vm->_draw->_destSpriteY +=
((collArea->bottom - collArea->top + 1) - 8) / 2;
_vm->_draw->spriteOperation(DRAW_PRINTTEXT);
descInd++;
}
for (i = 0; i < 40; i++) {
WRITE_VAR_OFFSET(i * 4 + 0x44, 0);
}
while (1) {
descInd = 0;
for (i = 0; i < 250; i++) {
collArea = &_collisionAreas[i];
if (collArea->left == -1)
continue;
if ((collArea->id & 0x8000) == 0)
continue;
if ((collArea->flags & 0x0f) < 3)
continue;
if ((collArea->flags & 0x0f) > 10)
continue;
if (descInd == *pCurPos) {
found = i;
break;
}
descInd++;
}
assert(found != -1);
collArea = &_collisionAreas[found];
key = inputArea(collArea->left, collArea->top,
collArea->right - collArea->left + 1,
collArea->bottom - collArea->top + 1,
inpDesc[*pCurPos].backColor, inpDesc[*pCurPos].frontColor,
_vm->_global->_inter_variables + collArea->key,
inpDesc[*pCurPos].fontIndex, collArea->flags, &time);
if (_vm->_inter->_terminate)
return 0;
switch (key) {
case 0:
if (_activeCollResId == 0)
return 0;
if ((_collisionAreas[_activeCollIndex].
flags & 0x0f) < 3)
return 0;
if ((_collisionAreas[_activeCollIndex].
flags & 0x0f) > 10)
return 0;
*pCurPos = 0;
for (i = 0; i < 250; i++) {
collArea = &_collisionAreas[i];
if (collArea->left == -1)
continue;
if ((collArea->id & 0x8000) == 0)
continue;
if ((collArea->flags & 0x0f) < 3)
continue;
if ((collArea->flags & 0x0f) > 10)
continue;
if (i == _activeCollIndex)
break;
pCurPos[0]++;
}
break;
case 0x3b00:
case 0x3c00:
case 0x3d00:
case 0x3e00:
case 0x3f00:
case 0x4000:
case 0x4100:
case 0x4200:
case 0x4300:
case 0x4400:
return key;
case 0x1c0d:
if (index == 1)
return key;
if (*pCurPos == index - 1) {
*pCurPos = 0;
break;
}
pCurPos[0]++;
break;
case 0x5000:
if (index - 1 > *pCurPos)
pCurPos[0]++;
break;
case 0x4800:
if (*pCurPos > 0)
pCurPos[0]--;
break;
}
}
}
int16 Game_v1::checkMousePoint(int16 all, int16 *resId, int16 *resIndex) {
Collision *ptr;
int16 i;
if (resId != 0)
*resId = 0;
*resIndex = 0;
ptr = _collisionAreas;
for (i = 0; ptr->left != -1; ptr++, i++) {
if (all) {
if ((ptr->flags & 0xf) > 1)
continue;
if ((ptr->flags & 0xff00) != 0)
continue;
if (_vm->_global->_inter_mouseX < ptr->left
|| _vm->_global->_inter_mouseX > ptr->right
|| _vm->_global->_inter_mouseY < ptr->top
|| _vm->_global->_inter_mouseY > ptr->bottom)
continue;
if (resId != 0)
*resId = ptr->id;
*resIndex = i;
return ptr->key;
} else {
if ((ptr->flags & 0xff00) != 0)
continue;
if ((ptr->flags & 0xf) != 1 && (ptr->flags & 0xf) != 2)
continue;
if ((ptr->flags & 0xf0) >> 4 != _mouseButtons - 1
&& (ptr->flags & 0xf0) >> 4 != 2)
continue;
if (_vm->_global->_inter_mouseX < ptr->left
|| _vm->_global->_inter_mouseX > ptr->right
|| _vm->_global->_inter_mouseY < ptr->top
|| _vm->_global->_inter_mouseY > ptr->bottom)
continue;
if (resId != 0)
*resId = ptr->id;
*resIndex = i;
return ptr->key;
}
}
if (_mouseButtons != 1 && all == 0)
return 0x11b;
return 0;
}
} // End of namespace Gob } // End of namespace Gob

939
engines/gob/game_v2.cpp
View file

File diff suppressed because it is too large Load diff

12
engines/gob/inter.cpp
View file

@ -279,7 +279,9 @@ void Inter::callSub(int16 retFlag) {
_terminate = true; _terminate = true;
} }
void Inter::initControlVars(void) { void Inter::initControlVars(char full) {
int i;
*_nestLevel = 0; *_nestLevel = 0;
*_breakFromLevel = -1; *_breakFromLevel = -1;
@ -287,8 +289,12 @@ void Inter::initControlVars(void) {
_breakFlag = false; _breakFlag = false;
_terminate = false; _terminate = false;
_animPalDir[0] = 0;
_soundEndTimeKey = 0; if (full == 1) {
for (i = 0; i < 8; i++)
_animPalDir[i] = 0;
_soundEndTimeKey = 0;
}
} }
void Inter::renewTimeInVars(void) { void Inter::renewTimeInVars(void) {

3
engines/gob/inter.h
View file

@ -57,7 +57,7 @@ public:
void storeKey(int16 key); void storeKey(int16 key);
void checkSwitchTable(char **ppExec); void checkSwitchTable(char **ppExec);
void callSub(int16 retFlag); void callSub(int16 retFlag);
void initControlVars(void); void initControlVars(char full);
void renewTimeInVars(void); void renewTimeInVars(void);
void manipulateMap(int16 xPos, int16 yPos, int16 item); void manipulateMap(int16 xPos, int16 yPos, int16 item);
virtual int16 loadSound(int16 slot) = 0; virtual int16 loadSound(int16 slot) = 0;
@ -317,6 +317,7 @@ protected:
void o2_stub0x80(void); void o2_stub0x80(void);
void o2_stub0x82(void); void o2_stub0x82(void);
void o2_stub0x85(void); void o2_stub0x85(void);
bool o2_checkData(char &cmdCount, int16 &counter, int16 &retFlag);
bool o2_stopSound(char &cmdCount, int16 &counter, int16 &retFlag); bool o2_stopSound(char &cmdCount, int16 &counter, int16 &retFlag);
bool o2_createSprite(char &cmdCount, int16 &counter, int16 &retFlag); bool o2_createSprite(char &cmdCount, int16 &counter, int16 &retFlag);
bool o2_animPalInit(char &cmdCount, int16 &counter, int16 &retFlag); bool o2_animPalInit(char &cmdCount, int16 &counter, int16 &retFlag);

19
engines/gob/inter_v2.cpp
View file

@ -526,7 +526,7 @@ void Inter_v2::setupOpcodes(void) {
OPCODE(o1_waitEndPlay), OPCODE(o1_waitEndPlay),
OPCODE(o1_playComposition), OPCODE(o1_playComposition),
OPCODE(o1_getFreeMem), OPCODE(o1_getFreeMem),
OPCODE(o1_checkData), OPCODE(o2_checkData),
/* 40 */ /* 40 */
{NULL, ""}, {NULL, ""},
OPCODE(o1_prepareStr), OPCODE(o1_prepareStr),
@ -1180,6 +1180,23 @@ void Inter_v2::loadMult(void) {
} }
} }
bool Inter_v2::o2_checkData(char &cmdCount, int16 &counter, int16 &retFlag) {
int16 handle;
int16 varOff;
evalExpr(0);
varOff = _vm->_parse->parseVarIndex();
handle = _vm->_dataio->openData(_vm->_global->_inter_resStr);
WRITE_VAR_OFFSET(varOff, handle);
if (handle >= 0) {
_vm->_dataio->closeData(handle);
WRITE_VAR(16, (uint32) _vm->_dataio->getDataSize(_vm->_global->_inter_resStr));
} else
WRITE_VAR(16, (uint32) -1);
return false;
}
bool Inter_v2::o2_stopSound(char &cmdCount, int16 &counter, int16 &retFlag) { bool Inter_v2::o2_stopSound(char &cmdCount, int16 &counter, int16 &retFlag) {
_vm->_snd->stopSound(_vm->_parse->parseValExpr()); _vm->_snd->stopSound(_vm->_parse->parseValExpr());
_soundEndTimeKey = 0; _soundEndTimeKey = 0;

13
engines/gob/mult.h
View file

@ -310,7 +310,10 @@ public:
int16 animIndices[10]; int16 animIndices[10];
int16 animLoaded[10]; int16 animLoaded[10];
int16 animKeysFrames[4]; int16 animKeysFrames[4];
int16 someKeysFrames[4]; int16 animKeysStartFrames[4];
int16 animKeysStopFrames[4];
int16 animKeysIndices[4][4];
int8 animDirection;
int16 textKeysCount; int16 textKeysCount;
Mult_TextKey *textKeys; Mult_TextKey *textKeys;
@ -323,13 +326,11 @@ public:
int16 frameRate; int16 frameRate;
Video::Color fadePal[5][16]; Video::Color fadePal[5][16];
int16 field_124[4][4]; // Not sure here either int16 field_124[4][4];
int16 palAnimIndices[4]; // Not sure here either int16 palAnimIndices[4]; // Not sure here
// TODO: Use this one instead of _frameStart
int16 frameStart; int16 frameStart;
int8 field_156;
int16 field_157[4];
int16 field_15F[4][4];
int16 field_17F[4][4]; int16 field_17F[4][4];
int16 someKeysCount[4]; int16 someKeysCount[4];

70
engines/gob/mult_v2.cpp
View file

@ -45,6 +45,7 @@ Mult_v2::Mult_v2(GobEngine *vm) : Mult_v1(vm) {
_renderData2 = 0; _renderData2 = 0;
_multData2 = 0; _multData2 = 0;
_frameStart = 0; // Temporarily to sync _frameStart and _multData2->frameStart
for (i = 0; i < 8; i++) _multDatas[i] = 0; for (i = 0; i < 8; i++) _multDatas[i] = 0;
} }
@ -76,6 +77,7 @@ void Mult_v2::loadMult(int16 resId) {
index = (resId & 0x8000) ? *_vm->_global->_inter_execPtr++ : 0; index = (resId & 0x8000) ? *_vm->_global->_inter_execPtr++ : 0;
_multData2 = new Mult_Data; _multData2 = new Mult_Data;
_frameStart = 0; // Temporarily to sync _frameStart and _multData2->frameStart
memset(_multData2, 0, sizeof(Mult_Data)); memset(_multData2, 0, sizeof(Mult_Data));
_multDatas[index] = _multData2; _multDatas[index] = _multData2;
@ -90,6 +92,7 @@ void Mult_v2::loadMult(int16 resId) {
_multData2->sndSlotsCount = 0; _multData2->sndSlotsCount = 0;
_multData2->frameStart = 0; _multData2->frameStart = 0;
_frameStart = 0;
extData = _vm->_game->loadExtData(resId, 0, 0); extData = _vm->_game->loadExtData(resId, 0, 0);
Common::MemoryReadStream data((byte *) extData, 4294967295U); Common::MemoryReadStream data((byte *) extData, 4294967295U);
@ -137,7 +140,7 @@ void Mult_v2::loadMult(int16 resId) {
_multData2->someKeysIndices[i] = -1; _multData2->someKeysIndices[i] = -1;
for (j = 0; j < 4; j++) { for (j = 0; j < 4; j++) {
_multData2->field_15F[i][j] = 0; _multData2->animKeysIndices[i][j] = 0;
_multData2->field_17F[i][j] = 0; _multData2->field_17F[i][j] = 0;
} }
@ -242,7 +245,7 @@ void Mult_v2::loadMult(int16 resId) {
if (_vm->_game->_totFileData[0x29] >= 51) { if (_vm->_game->_totFileData[0x29] >= 51) {
size = data.readSint16LE(); size = data.readSint16LE();
_multData2->somepointer10 = new char[size * 20]; _multData2->somepointer10 = new char[size * 20];
// data.read(_multData2->somepointer09 /*???*/, size * 20); // According to the original asm, these bytes are written into _multData2->somepointer09!
data.read(_multData2->somepointer10, size * 20); data.read(_multData2->somepointer10, size * 20);
size = _vm->_inter->load16(); size = _vm->_inter->load16();
if (size > 0) { if (size > 0) {
@ -277,6 +280,7 @@ void Mult_v2::setMultData(uint16 multindex) {
debugC(4, DEBUG_GAMEFLOW, "Switching to mult %d", multindex); debugC(4, DEBUG_GAMEFLOW, "Switching to mult %d", multindex);
_multData2 = _multDatas[multindex]; _multData2 = _multDatas[multindex];
_frameStart = _multData2->frameStart; // Temporarily to sync _frameStart and _multData2->frameStart
} }
void Mult_v2::multSub(uint16 multindex) { void Mult_v2::multSub(uint16 multindex) {
@ -295,6 +299,7 @@ void Mult_v2::multSub(uint16 multindex) {
debugC(4, DEBUG_GAMEFLOW, "Sub mult %d", multindex); debugC(4, DEBUG_GAMEFLOW, "Sub mult %d", multindex);
_multData2 = _multDatas[multindex]; _multData2 = _multDatas[multindex];
_frameStart = _multData2->frameStart; // Temporarily to sync _frameStart and _multData2->frameStart
if (_multData2 == 0) { if (_multData2 == 0) {
_vm->_parse->parseValExpr(); _vm->_parse->parseValExpr();
@ -315,9 +320,9 @@ void Mult_v2::multSub(uint16 multindex) {
if (flags & 0x400) { if (flags & 0x400) {
flags = 0x400; flags = 0x400;
_multData2->field_156 = -1; _multData2->animDirection = -1;
} else { } else {
_multData2->field_156 = 1; _multData2->animDirection = 1;
flags &= 0x7F; flags &= 0x7F;
} }
@ -327,7 +332,7 @@ void Mult_v2::multSub(uint16 multindex) {
} }
expr = _vm->_parse->parseValExpr(); expr = _vm->_parse->parseValExpr();
_multData2->animKeysFrames[index] = expr; _multData2->animKeysFrames[index] = expr;
_multData2->someKeysFrames[index] = expr; _multData2->animKeysStartFrames[index] = expr;
WRITE_VAR(18 + index, expr); WRITE_VAR(18 + index, expr);
if (expr == -1) { if (expr == -1) {
@ -337,22 +342,22 @@ void Mult_v2::multSub(uint16 multindex) {
_objects[_multData2->field_124[index][i]].pAnimData->animType = _objects[_multData2->field_124[index][i]].pAnimData->animType =
_objects[_multData2->field_124[index][i]].pAnimData->field_17; _objects[_multData2->field_124[index][i]].pAnimData->field_17;
} else { } else {
if (_multData2->field_156 == 1) { if (_multData2->animDirection == 1) {
_multData2->field_157[index] = 32000; _multData2->animKeysStopFrames[index] = 32000;
for (i = 0; i < _multData2->textKeysCount; i++) { for (i = 0; i < _multData2->textKeysCount; i++) {
textFrame = _multData2->textKeys[i].frame; textFrame = _multData2->textKeys[i].frame;
if ((textFrame > _multData2->someKeysFrames[index]) && if ((textFrame > _multData2->animKeysStartFrames[index]) &&
(textFrame < _multData2->field_157[index])) { (textFrame < _multData2->animKeysStopFrames[index])) {
_multData2->field_157[index] = textFrame; _multData2->animKeysStopFrames[index] = textFrame;
} }
} }
} else { } else {
_multData2->field_157[index] = 0; _multData2->animKeysStopFrames[index] = 0;
for (i = 0; i < _multData2->textKeysCount; i++) { for (i = 0; i < _multData2->textKeysCount; i++) {
textFrame = _multData2->textKeys[i].frame; textFrame = _multData2->textKeys[i].frame;
if ((textFrame < _multData2->someKeysFrames[index]) && if ((textFrame < _multData2->animKeysStartFrames[index]) &&
(textFrame > _multData2->field_157[index])) { (textFrame > _multData2->animKeysStopFrames[index])) {
_multData2->field_157[index] = textFrame; _multData2->animKeysStopFrames[index] = textFrame;
} }
} }
} }
@ -365,27 +370,27 @@ void Mult_v2::multSub(uint16 multindex) {
} }
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
_multData2->field_15F[index][i] = 0; _multData2->animKeysIndices[index][i] = 0;
for (j = 0; j < _multData2->animKeysCount[i]; j++) { for (j = 0; j < _multData2->animKeysCount[i]; j++) {
if (_multData2->animKeys[i][j].frame >= _multData2->someKeysFrames[index]) if (_multData2->animKeys[i][j].frame == _multData2->animKeysStartFrames[index])
_multData2->field_15F[index][i] = j; _multData2->animKeysIndices[index][i] = j;
} }
} }
if (_multData2->field_156 == -1) { // loc_60CF if (_multData2->animDirection == -1) { // loc_60CF
warning("Mult_v2::multSub(), someKeys and someKeysIndices"); warning("Mult_v2::multSub(), someKeys and someKeysIndices");
} }
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
_multData2->field_17F[index][i] = 0; _multData2->field_17F[index][i] = 0;
for (j = 0; j < _multData2->someKeysCount[i]; j++) { for (j = 0; j < _multData2->someKeysCount[i]; j++) {
if (_multData2->field_156 == 1) { if (_multData2->animDirection == 1) {
if (_multData2->someKeys[i][j].frame >= _multData2->someKeysFrames[index]) { if (_multData2->someKeys[i][j].frame >= _multData2->animKeysStartFrames[index]) {
_multData2->field_17F[index][i] = j; _multData2->field_17F[index][i] = j;
break; break;
} }
} else { } else {
if (_multData2->someKeys[i][j].frame >= _multData2->field_157[index]) { if (_multData2->someKeys[i][j].frame >= _multData2->animKeysStopFrames[index]) {
_multData2->field_17F[index][i] = j; _multData2->field_17F[index][i] = j;
break; break;
} }
@ -431,8 +436,6 @@ void Mult_v2::playMult(int16 startFrame, int16 endFrame, char checkEscape,
delete[] _objects; delete[] _objects;
if (_orderArray) if (_orderArray)
delete[] _orderArray; delete[] _orderArray;
/* if (_renderData)
delete[] _renderData;*/
if (_renderData2) if (_renderData2)
delete[] _renderData2; delete[] _renderData2;
@ -441,8 +444,6 @@ void Mult_v2::playMult(int16 startFrame, int16 endFrame, char checkEscape,
_orderArray = new int8[_objCount]; _orderArray = new int8[_objCount];
memset(_orderArray, 0, _objCount * sizeof(int8)); memset(_orderArray, 0, _objCount * sizeof(int8));
/* _renderData = new int16[9 * _objCount];
memset(_renderData, 0, _objCount * 9 * sizeof(int16));*/
_renderData2 = new Mult_Object*[_objCount]; _renderData2 = new Mult_Object*[_objCount];
memset(_renderData2, 0, _objCount * sizeof(Mult_Object*)); memset(_renderData2, 0, _objCount * sizeof(Mult_Object*));
@ -580,7 +581,7 @@ void Mult_v2::playMult(int16 startFrame, int16 endFrame, char checkEscape,
WRITE_VAR(57, (uint32)-1); WRITE_VAR(57, (uint32)-1);
} else { } else {
WRITE_VAR(57, _frame - 1 - _frameStart); WRITE_VAR(57, _frame - 1 - _multData2->frameStart);
} }
} }
@ -696,6 +697,7 @@ void Mult_v2::drawText(char *pStop, char *pStopNoClear) {
*pStop = 0; *pStop = 0;
} else if (cmd == 1) { } else if (cmd == 1) {
*pStopNoClear = 1; *pStopNoClear = 1;
_multData2->frameStart = 0;
_frameStart = 0; _frameStart = 0;
} else if (cmd == 3) { } else if (cmd == 3) {
*pStop = 0; *pStop = 0;
@ -900,14 +902,14 @@ void Mult_v2::sub_62DD(int16 index) {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
if (_multData2->field_124[index][i] != -1) { if (_multData2->field_124[index][i] != -1) {
for (j = _multData2->field_15F[index][i]; j < _multData2->animKeysCount[i]; j++) { for (j = _multData2->animKeysIndices[index][i]; j < _multData2->animKeysCount[i]; j++) {
if ((i >= 4) || (j >= _multData2->animKeysCount[i])) if ((i >= 4) || (j >= _multData2->animKeysCount[i]))
continue; continue;
animKey = &_multData2->animKeys[i][j]; animKey = &_multData2->animKeys[i][j];
if (animKey->frame == frame) { if (animKey->frame == frame) {
animObj = &_objects[_multData2->field_124[index][i]]; animObj = &_objects[_multData2->field_124[index][i]];
if (animKey->layer > -1) { if (animKey->layer > -1) {
_multData2->field_15F[index][i] = j; _multData2->animKeysIndices[index][i] = j;
(*animObj->pPosX) = animKey->posX; (*animObj->pPosX) = animKey->posX;
(*animObj->pPosY) = animKey->posY; (*animObj->pPosY) = animKey->posY;
animObj->pAnimData->frame = 0; animObj->pAnimData->frame = 0;
@ -947,9 +949,9 @@ void Mult_v2::sub_62DD(int16 index) {
_multData2->someKeysIndices[1] = -1; _multData2->someKeysIndices[1] = -1;
_multData2->someKeysIndices[2] = -1; _multData2->someKeysIndices[2] = -1;
_multData2->someKeysIndices[3] = -1; _multData2->someKeysIndices[3] = -1;
if ((_multData2->field_156 == 1) || (someKey2->field_2 == 1)) if ((_multData2->animDirection == 1) || (someKey2->field_2 == 1))
_multData2->someKeysIndices[i] = j; _multData2->someKeysIndices[i] = j;
else if (_multData2->field_157[index] == frame) else if (_multData2->animKeysStopFrames[index] == frame)
_multData2->someKeysIndices[i] = -1; _multData2->someKeysIndices[i] = -1;
else else
_multData2->someKeysIndices[i] = j - 1; _multData2->someKeysIndices[i] = j - 1;
@ -962,7 +964,7 @@ void Mult_v2::sub_62DD(int16 index) {
if (_multData2->someKeysIndices[i] != -1) { if (_multData2->someKeysIndices[i] != -1) {
/* /*
int arg3 = frame - _multData2->someKeys[i][_multData2->someKeysIndices[i]].field_0; int arg3 = frame - _multData2->someKeys[i][_multData2->someKeysIndices[i]].field_0;
int arg2 = _multData2->field_156; int arg2 = _multData2->animDirection;
if ((arg2 != 1) && (--arg3 > 0)) if ((arg2 != 1) && (--arg3 > 0))
arg3 = 0; arg3 = 0;
int arg1 = _multData2->someKeys[i][_multData2->someKeysIndices[i]]; int arg1 = _multData2->someKeys[i][_multData2->someKeysIndices[i]];
@ -976,7 +978,7 @@ void Mult_v2::sub_62DD(int16 index) {
doSoundAnim(0, frame); doSoundAnim(0, frame);
WRITE_VAR(22, frame); WRITE_VAR(22, frame);
if (_multData2->field_157[index] == frame) { if (_multData2->animKeysStopFrames[index] == frame) {
_multData2->someKeysIndices[0] = -1; _multData2->someKeysIndices[0] = -1;
_multData2->someKeysIndices[1] = -1; _multData2->someKeysIndices[1] = -1;
_multData2->someKeysIndices[2] = -1; _multData2->someKeysIndices[2] = -1;
@ -986,7 +988,7 @@ void Mult_v2::sub_62DD(int16 index) {
if ((_multData2->field_124[index][i] != -1) && (_multData2->field_124[index][i] != 1024)) if ((_multData2->field_124[index][i] != -1) && (_multData2->field_124[index][i] != 1024))
_objects[_multData2->field_124[index][i]].pAnimData->animType = _objects[_multData2->field_124[index][i]].pAnimData->animType =
_objects[_multData2->field_124[index][i]].pAnimData->field_17; _objects[_multData2->field_124[index][i]].pAnimData->field_17;
} else if(_multData2->field_156 == 1) } else if(_multData2->animDirection == 1)
frame++; frame++;
else else
frame--; frame--;
@ -1004,6 +1006,7 @@ void Mult_v2::sub_6A35(void) {
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
if (_multDatas[i] != 0) { if (_multDatas[i] != 0) {
_multData2 = _multDatas[i]; _multData2 = _multDatas[i];
_frameStart = _multData2->frameStart; // Temporarily to sync _frameStart and _multData2->frameStart
for (j = 0; j < 4; j++) for (j = 0; j < 4; j++)
sub_62DD(j); sub_62DD(j);
} }
@ -1404,6 +1407,7 @@ void Mult_v2::freeMultKeys(void) {
delete _multData2; delete _multData2;
_multData2 = 0; _multData2 = 0;
_frameStart = 0; // Temporarily to sync _frameStart and _multData2->frameStart
} }
} // End of namespace Gob } // End of namespace Gob