diff options
| author | Paul Gilbert | 2018-04-05 07:36:45 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2018-04-05 07:36:45 -0400 |
| commit | 37dbd365e2cb40699a065b416db3b1cd638f63b8 (patch) | |
| tree | 7f2087be6a2229d34d821aac403009d7e0669545 /engines | |
| parent | 5b1f05413314f7ed030983b6541072ac1d197b4f (diff) | |
| download | scummvm-rg350-37dbd365e2cb40699a065b416db3b1cd638f63b8.tar.gz scummvm-rg350-37dbd365e2cb40699a065b416db3b1cd638f63b8.tar.bz2 scummvm-rg350-37dbd365e2cb40699a065b416db3b1cd638f63b8.zip | |
XEEN: Fix lockpicking to use selected character
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/xeen/party.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/engines/xeen/party.cpp b/engines/xeen/party.cpp index 1d00632a18..78e7a3a200 100644 --- a/engines/xeen/party.cpp +++ b/engines/xeen/party.cpp @@ -1438,7 +1438,6 @@ bool Party::giveExt(int mode1, uint val1, int mode2, uint val2, int mode3, uint Map &map = *g_vm->_map; Scripts &scripts = *g_vm->_scripts; Sound &sound = *g_vm->_sound; - Character &c = _itemsCharacter; if (intf._objNumber != -1 && !scripts._animCounter) { MazeObject &obj = map._mobData._objects[intf._objNumber]; @@ -1450,7 +1449,8 @@ bool Party::giveExt(int mode1, uint val1, int mode2, uint val2, int mode3, uint case 16: case 58: - case 73: + case 73: { + Character &c = _activeParty[charId]; obj._frame = 1; if (obj._position.x != 20) { @@ -1481,6 +1481,11 @@ bool Party::giveExt(int mode1, uint val1, int mode2, uint val2, int mode3, uint return true; } } + break; + } + + default: + break; } } @@ -1498,7 +1503,7 @@ bool Party::giveExt(int mode1, uint val1, int mode2, uint val2, int mode3, uint break; case 66: - c.clear(); + _itemsCharacter.clear(); if (giveTake(0, 0, mode, val, charId)) return true; |