mirror of
https://github.com/libretro/scummvm.git
synced 2024-12-16 22:58:09 +00:00
M4: Added further code fragments to enable player to move again
svn-id: r51462
This commit is contained in:
parent
fd804eb44b
commit
28de229b51
@ -185,9 +185,9 @@ void HotSpotList::dump() {
|
||||
|
||||
uint32 HotSpotList::readHotSpotInteger(Common::SeekableReadStream* hotspotStream) {
|
||||
if (_vm->isM4())
|
||||
return hotspotStream->readUint32LE();
|
||||
return hotspotStream->readSint32LE();
|
||||
else
|
||||
return hotspotStream->readUint16LE();
|
||||
return hotspotStream->readSint16LE();
|
||||
}
|
||||
|
||||
void HotSpotList::loadHotSpots(Common::SeekableReadStream* hotspotStream, int hotspotCount) {
|
||||
@ -196,7 +196,7 @@ void HotSpotList::loadHotSpots(Common::SeekableReadStream* hotspotStream, int ho
|
||||
char buffer[256];
|
||||
uint32 strLength = 0;
|
||||
uint32 index = 0;
|
||||
uint32 feetX, feetY;
|
||||
int feetX, feetY;
|
||||
int cursorOffset = (_vm ->isM4()) ? 0 : 1;
|
||||
|
||||
for (int i = 0; i < hotspotCount; i++) {
|
||||
|
@ -243,8 +243,10 @@ void MadsScene::mouseMove(int x, int y) {
|
||||
if (currentHotSpot != NULL) {
|
||||
_vm->_mouse->setCursorNum(currentHotSpot->getCursor());
|
||||
|
||||
_action._selectedRow = -1;
|
||||
_action._actionMode = ACTMODE_NONE;
|
||||
_action._actionMode2 = ACTMODE2_4;
|
||||
_action._hotspotId = currentHotSpot->getIndex();
|
||||
|
||||
|
||||
} else {
|
||||
_vm->_mouse->setCursorNum(0);
|
||||
|
@ -299,8 +299,8 @@ void MadsAction::startAction() {
|
||||
_madsVm->scene()->_destPos.y = hs.getFeetY();
|
||||
}
|
||||
_madsVm->scene()->_destFacing = hs.getFacing();
|
||||
hotspotId = -1;
|
||||
}
|
||||
hotspotId = -1;
|
||||
}
|
||||
|
||||
if (hotspotId >= 0) {
|
||||
|
Loading…
Reference in New Issue
Block a user