libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-22 20:21:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed the lock when leaving the menu

Browse Source 
svn-id: r24719
This commit is contained in:
Sven Hesse 2006-11-14 14:58:41 +00:00
parent 53faadfdb6
commit 3f0ebaaa18
7 changed files with 85 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/gob/draw_v2.cpp
View File

@ -269,7 +269,7 @@ void Draw_v2::printText(void) {
adjustCoords(0, &rectLeft, &rectTop);
adjustCoords(2, &rectRight, &rectBottom);
if (colId != -1)
_vm->_game->addNewCollision(colId & 0x0D000, rectLeft, rectTop,
_vm->_game->addNewCollision(colId + 0xD000, rectLeft, rectTop,
rectRight, rectBottom, 2, 0, 0, 0);
if (_word_2E8E2 != 2)
printTextCentered(extraCmd & 0x0F, rectLeft + 4, rectTop + 4,
@ -357,7 +357,7 @@ void Draw_v2::printText(void) {
rectBottom = destY + (int16)READ_LE_UINT16(ptr + 6);
adjustCoords(2, &rectLeft, &rectTop);
adjustCoords(2, &rectRight, &rectBottom);
_vm->_game->addNewCollision(colId & 0x0D000, rectLeft, rectTop,
_vm->_game->addNewCollision(colId + 0x0D000, rectLeft, rectTop,
rectRight, rectBottom, 2, 0, 0, 0);
ptr += 8;
}

19
engines/gob/game.cpp
View File

@ -670,6 +670,8 @@ void Game::loadImFile(void) {
void Game::start(void) {
_collisionAreas = new Collision[250];
memset(_collisionAreas, 0, 250 * sizeof(Collision));
prepareStart();
playTot(-2);
@ -778,9 +780,9 @@ void Game::switchTotSub(int16 index, int16 skipPlay) {
_totTextData = _totTextDataArray[_curBackupPos];
_totFileData = _totFileDataArray[_curBackupPos];
_totResourceTable = _totResourceTableArray[_curBackupPos];
_imFileData = _imFileDataArray[_curBackupPos];
_extTable = _extTableArray[_curBackupPos];
_extHandle = _extHandleArray[_curBackupPos];
_imFileData = _imFileDataArray[_curBackupPos];
_vm->_global->_inter_variables = _variablesArray[_curBackupPos];
strcpy(_curTotFile, _curTotFileArray[_curBackupPos]);
strcpy(_curExtFile, _curTotFile);
@ -945,13 +947,14 @@ void Game::collAreaSub(int16 index, int8 enter) {
collId = _collisionAreas[index].id & 0xF000;
if ((collId != 0xA000) && (collId != 0x9000))
WRITE_VAR(17, collId);
else if (enter == 0)
WRITE_VAR(17, _collisionAreas[index].id & 0x0FFF);
else
WRITE_VAR(17, -(_collisionAreas[index].id & 0x0FFF));
if ((collId == 0xA000) || (collId == 0x9000))
{
if (enter == 0)
WRITE_VAR(17, _collisionAreas[index].id & 0x0FFF);
else
WRITE_VAR(17, -(_collisionAreas[index].id & 0x0FFF));
}
if (enter != 0) {
if (_collisionAreas[index].funcEnter != 0)
collSub(_collisionAreas[index].funcEnter);

6
engines/gob/game.h
View File

@ -221,7 +221,7 @@ public:
virtual void playTot(int16 skipPlay) = 0;
virtual void clearCollisions(void) = 0;
virtual void addNewCollision(int16 id, int16 left, int16 top, int16 right,
virtual int16 addNewCollision(int16 id, int16 left, int16 top, int16 right,
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,
@ -285,7 +285,7 @@ class Game_v1 : public Game {
public:
virtual void playTot(int16 skipPlay);
virtual void clearCollisions(void);
virtual void addNewCollision(int16 id, int16 left, int16 top, int16 right,
virtual int16 addNewCollision(int16 id, int16 left, int16 top, int16 right,
int16 bottom, int16 flags, int16 key, int16 funcEnter, int16 funcLeave);
virtual void collisionsBlock(void);
virtual int16 multiEdit(int16 time, int16 index, int16 *pCurPos,
@ -309,7 +309,7 @@ class Game_v2 : public Game_v1 {
public:
virtual void playTot(int16 skipPlay);
virtual void clearCollisions(void);
virtual void addNewCollision(int16 id, int16 left, int16 top, int16 right,
virtual int16 addNewCollision(int16 id, int16 left, int16 top, int16 right,
int16 bottom, int16 flags, int16 key, int16 funcEnter, int16 funcLeave);
virtual void collisionsBlock(void);
virtual int16 multiEdit(int16 time, int16 index, int16 *pCurPos,

23
engines/gob/game_v1.cpp
View File

@ -260,7 +260,7 @@ void Game_v1::clearCollisions() {
}
}
void Game_v1::addNewCollision(int16 id, int16 left, int16 top, int16 right, int16 bottom,
int16 Game_v1::addNewCollision(int16 id, int16 left, int16 top, int16 right, int16 bottom,
int16 flags, int16 key, int16 funcEnter, int16 funcLeave) {
int16 i;
Collision *ptr;
@ -285,9 +285,10 @@ void Game_v1::addNewCollision(int16 id, int16 left, int16 top, int16 right, int1
ptr->key = key;
ptr->funcEnter = funcEnter;
ptr->funcLeave = funcLeave;
return;
return i;
}
error("addNewCollision: Collision array full!\n");
return 0;
}
void Game_v1::pushCollisions(char all) {
@ -660,7 +661,7 @@ void Game_v1::collisionsBlock(void) {
int16 counter;
int16 var_24;
int16 var_26;
int16 _collStackPos;
int16 collStackPos;
Collision *collPtr;
int16 timeKey;
char *savedIP;
@ -932,15 +933,15 @@ void Game_v1::collisionsBlock(void) {
if (deltaTime != 0 && VAR(16) == 0) {
if (stackPos2 != 0) {
_collStackPos = 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)
collStackPos++;
if (collStackPos != stackPos2)
continue;
_activeCollResId = collPtr->id;
@ -1047,9 +1048,9 @@ void Game_v1::collisionsBlock(void) {
_shouldPushColls = 1;
_collStackPos = _collStackSize;
collStackPos = _collStackSize;
_vm->_inter->funcBlock(0);
if (_collStackPos != _collStackSize)
if (collStackPos != _collStackSize)
popCollisions();
_shouldPushColls = 0;
_vm->_global->_inter_execPtr = savedIP;
@ -1061,7 +1062,7 @@ void Game_v1::collisionsBlock(void) {
while (_activeCollResId == 0 && !_vm->_inter->_terminate && !_vm->_quitRequested);
if (((uint16)_activeCollResId & ~0x8000) == collResId) {
_collStackPos = 0;
collStackPos = 0;
var_24 = 0;
var_26 = 1;
for (i = 0; i < 250; i++) {
@ -1113,7 +1114,7 @@ void Game_v1::collisionsBlock(void) {
break;
}
} while (READ_LE_UINT16(descArray[var_24].ptr - 2) > pos);
_collStackPos++;
collStackPos++;
} else {
VAR(17 + var_26) = 2;
}
@ -1121,7 +1122,7 @@ void Game_v1::collisionsBlock(void) {
var_26++;
}
if (_collStackPos != (int16)VAR(17))
if (collStackPos != (int16)VAR(17))
WRITE_VAR(17, 0);
else
WRITE_VAR(17, 1);

100
engines/gob/game_v2.cpp
View File

@ -282,13 +282,13 @@ void Game_v2::clearCollisions() {
_lastCollKey = 0;
for (i = 0; i < 250; i++) {
_collisionAreas[i].id = 0;
for (i = 0; i < 150; i++) {
// _collisionAreas[i].id = 0;
_collisionAreas[i].left = -1;
}
}
void Game_v2::addNewCollision(int16 id, int16 left, int16 top, int16 right, int16 bottom,
int16 Game_v2::addNewCollision(int16 id, int16 left, int16 top, int16 right, int16 bottom,
int16 flags, int16 key, int16 funcEnter, int16 funcLeave) {
int16 i;
Collision *ptr;
@ -314,9 +314,11 @@ void Game_v2::addNewCollision(int16 id, int16 left, int16 top, int16 right, int1
ptr->funcEnter = funcEnter;
ptr->funcLeave = funcLeave;
ptr->field_12 = 0;
return;
return i;
}
error("addNewCollision: Collision array full!\n");
return 0;
}
void Game_v2::pushCollisions(char all) {
@ -325,14 +327,16 @@ void Game_v2::pushCollisions(char all) {
int16 size;
debugC(1, DEBUG_COLLISIONS, "pushCollisions");
for (size = 0, srcPtr = _collisionAreas; srcPtr->left != -1;
srcPtr++) {
if (all || (srcPtr->id >= 20))
for (size = 0, srcPtr = _collisionAreas; srcPtr->left != -1; srcPtr++)
if (all || (((uint16) srcPtr->id) >= 20))
size++;
}
destPtr = new Collision[size];
_collStack[_collStackSize] = destPtr;
if (_vm->_inter->_terminate)
return;
_collStackElemSizes[_collStackSize] = size;
if (_shouldPushColls != 0)
@ -342,10 +346,13 @@ void Game_v2::pushCollisions(char all) {
_collLasts[_collStackSize].key = _lastCollKey;
_collLasts[_collStackSize].id = _lastCollId;
_collLasts[_collStackSize].areaIndex = _lastCollAreaIndex;
_lastCollKey = 0;
_lastCollId = 0;
_lastCollAreaIndex = 0;
_collStackSize++;
for (srcPtr = _collisionAreas; srcPtr->left != -1; srcPtr++) {
if (all || (srcPtr->id >= 20)) {
if (all || (((uint16) srcPtr->id) >= 20)) {
memcpy(destPtr, srcPtr, sizeof(Collision));
srcPtr->left = -1;
destPtr++;
@ -371,9 +378,7 @@ void Game_v2::popCollisions(void) {
for (destPtr = _collisionAreas; destPtr->left != -1; destPtr++);
srcPtr = _collStack[_collStackSize];
memcpy(destPtr, srcPtr,
_collStackElemSizes[_collStackSize] *
sizeof(Collision));
memcpy(destPtr, srcPtr, _collStackElemSizes[_collStackSize] * sizeof(Collision));
delete[] _collStack[_collStackSize];
}
@ -414,6 +419,7 @@ int16 Game_v2::checkCollisions(char handleMouse, int16 deltaTime, int16 *pResId,
int16 key;
int16 oldIndex;
int16 oldId;
int16 newkey;
uint32 timeKey;
if (deltaTime >= -1) {
@ -599,15 +605,15 @@ int16 Game_v2::checkCollisions(char handleMouse, int16 deltaTime, int16 *pResId,
oldIndex = _lastCollAreaIndex;
oldId = _lastCollId;
key = checkMousePoint(1, &_lastCollId, &_lastCollAreaIndex);
newkey = checkMousePoint(1, &_lastCollId, &_lastCollAreaIndex);
if (key != _lastCollKey) {
if (newkey != _lastCollKey) {
if ((_lastCollKey != 0) && (oldId & 0x8000))
collAreaSub(oldIndex, 0);
_lastCollKey = key;
_lastCollKey = newkey;
if ((key != 0) && (_lastCollId & 0x8000))
if ((newkey != 0) && (_lastCollId & 0x8000))
collAreaSub(_lastCollAreaIndex, 1);
}
}
@ -685,7 +691,7 @@ void Game_v2::prepareStart(void) {
void Game_v2::collisionsBlock(void) {
InputDesc descArray[20];
int16 array[250];
char count;
byte count;
int16 collResId;
char *startIP;
int16 curCmd;
@ -705,12 +711,13 @@ void Game_v2::collisionsBlock(void) {
int16 descIndex;
int16 timeVal;
int16 offsetIP;
int16 collId;
char *str;
int16 i;
int16 counter;
int16 var_24;
int16 var_26;
int16 _collStackPos;
int16 collStackPos;
Collision *collPtr;
Collision *collArea;
int16 timeKey;
@ -749,7 +756,7 @@ void Game_v2::collisionsBlock(void) {
for (curCmd = 0; curCmd < count; curCmd++) {
array[curCmd] = 0;
cmd = *_vm->_global->_inter_execPtr++;
cmd = (byte) *_vm->_global->_inter_execPtr++;
if ((cmd & 0x40) != 0) {
cmd -= 0x40;
@ -799,15 +806,14 @@ void Game_v2::collisionsBlock(void) {
_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,
collId = 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);
if (key <= 150)
_collisionAreas[key].field_12 = offsetIP;
_collisionAreas[collId].field_12 = offsetIP;
break;
case 1:
@ -821,15 +827,14 @@ void Game_v2::collisionsBlock(void) {
if (key == 0)
key = curCmd + 0xa000;
addNewCollision(curCmd + 0x8000, left, top, left + width - 1, top + height - 1,
collId = 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);
if (key <= 150)
_collisionAreas[key].field_12 = offsetIP;
_collisionAreas[collId].field_12 = offsetIP;
break;
case 3:
@ -849,7 +854,7 @@ void Game_v2::collisionsBlock(void) {
if ((cmd >= 5) && (cmd <= 8)) {
descArray[index].ptr = _vm->_global->_inter_execPtr + 2;
_vm->_global->_inter_execPtr += _vm->_inter->load16();;
_vm->_global->_inter_execPtr += READ_LE_UINT16(_vm->_global->_inter_execPtr) + 2;
} else
descArray[index].ptr = 0;
@ -912,15 +917,14 @@ void Game_v2::collisionsBlock(void) {
array[curCmd] = _vm->_inter->load16();
flags = _vm->_inter->load16();
addNewCollision(curCmd + 0x8000, left, top, left + width - 1, top + height - 1,
collId = 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);
if (key <= 150)
_collisionAreas[key].field_12 = offsetIP;
_collisionAreas[collId].field_12 = offsetIP;
break;
case 21:
@ -928,15 +932,14 @@ void Game_v2::collisionsBlock(void) {
array[curCmd] = _vm->_inter->load16();
flags = _vm->_inter->load16() & 3;
addNewCollision(curCmd + 0x8000, left, top, left + width - 1, top + height - 1,
collId = 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);
if (key <= 150)
_collisionAreas[key].field_12 = offsetIP;
_collisionAreas[collId].field_12 = offsetIP;
break;
}
}
@ -953,7 +956,7 @@ void Game_v2::collisionsBlock(void) {
if (key == 0x1c0d) {
for (i = 0; i < 150; i++) {
if (_collisionAreas[i].left == -1)
continue;
break;
if ((_collisionAreas[i].id & 0xC000) != 0x8000)
continue;
@ -983,7 +986,7 @@ void Game_v2::collisionsBlock(void) {
if (key != 0) {
for (i = 0; i < 150; i++) {
if (_collisionAreas[i].left == -1)
continue;
break;
if ((_collisionAreas[i].id & 0xC000) != 0x8000)
continue;
@ -998,7 +1001,7 @@ void Game_v2::collisionsBlock(void) {
if (_activeCollResId == 0) {
for (i = 0; i < 150; i++) {
if (_collisionAreas[i].left == -1)
continue;
break;
if ((_collisionAreas[i].id & 0xC000) != 0x8000)
continue;
@ -1019,15 +1022,14 @@ void Game_v2::collisionsBlock(void) {
}
} else if (deltaTime != 0) {
if (stackPos2 != 0) {
_collStackPos = 0;
collPtr = _collisionAreas;
collStackPos = 0;
for (i = 0, collPtr = _collisionAreas; collPtr->left != -1; i++, collPtr++) {
for (i = 0, collPtr = collArea; collPtr->left != -1; i++, collPtr++) {
if ((collPtr->id & 0xF000) != 0x8000)
continue;
_collStackPos++;
if (_collStackPos != stackPos2)
collStackPos++;
if (collStackPos != stackPos2)
continue;
_activeCollResId = collPtr->id;
@ -1050,6 +1052,8 @@ void Game_v2::collisionsBlock(void) {
if (deltaTime < 2)
deltaTime = 2;
if (deltaTime > timeVal)
deltaTime = timeVal;
}
if (VAR(16) == 0)
@ -1105,7 +1109,7 @@ void Game_v2::collisionsBlock(void) {
while (_activeCollResId == 0 && !_vm->_inter->_terminate && !_vm->_quitRequested);
if ((_activeCollResId & 0xFFF) == collResId) {
_collStackPos = 0;
collStackPos = 0;
var_24 = 0;
var_26 = 1;
for (i = 0; i < 150; i++) {
@ -1160,7 +1164,7 @@ void Game_v2::collisionsBlock(void) {
break;
}
} while (READ_LE_UINT16(descArray[var_24].ptr - 2) > pos);
_collStackPos++;
collStackPos++;
} else {
VAR(17 + var_26) = 2;
}
@ -1168,7 +1172,7 @@ void Game_v2::collisionsBlock(void) {
var_26++;
}
if (_collStackPos != (int16)VAR(17))
if (collStackPos != (int16)VAR(17))
WRITE_VAR(17, 0);
else
WRITE_VAR(17, 1);
@ -1182,10 +1186,12 @@ void Game_v2::collisionsBlock(void) {
savedIP = (char *)_totFileData + _collisionAreas[_activeCollIndex].funcLeave;
_vm->_inter->storeMouse();
if ((_activeCollResId & 0xF000) == 0x8000)
WRITE_VAR(16, array[_activeCollResId & 0xFFF]);
else
WRITE_VAR(16, _activeCollResId & 0xFFF);
if (VAR(16) == 0) {
if ((_activeCollResId & 0xF000) == 0x8000)
WRITE_VAR(16, array[_activeCollResId & 0xFFF]);
else
WRITE_VAR(16, _activeCollResId & 0xFFF);
}
}
for (curCmd = 0; curCmd < count; curCmd++)

2
engines/gob/parse_v2.cpp
View File

@ -358,7 +358,7 @@ int16 Parse_v2::parseExpr(char stopToken, byte *arg_2) {
int16 dimCount;
int16 temp;
int16 temp2;
uint16 offset;
int16 offset;
int16 dim;
char var_1A;
int16 stkPos;

4
engines/gob/video.cpp
View File

@ -88,7 +88,9 @@ void Video::freeSurfDesc(SurfaceDesc * surfDesc) {
if (surfDesc == 0)
return;
delete[] surfDesc->vidPtr;
// TODO: valgrind shows an "Invalid free() / delete / delete[]" here...
// delete[] surfDesc->vidPtr;
// GOB2: surfDesc != _vm->_draw->_frontSurface (since _frontSurface is set
// to _pPrimarySurfDesc in Game::prepareStart(), is there a difference?)
if (surfDesc != _vm->_global->_pPrimarySurfDesc) {