diff options
| author | Florian Kagerer | 2010-10-23 16:01:40 +0000 |
|---|---|---|
| committer | Florian Kagerer | 2010-10-23 16:01:40 +0000 |
| commit | 09f77eb4642eae4e945f8c10554ce204aff450e0 (patch) | |
| tree | 681573361b2214f0a425d5bb5156774807eb8790 /engines/kyra/lol.cpp | |
| parent | 0d54400806f5e25ea60e56d2fa84de3643c50f8c (diff) | |
| download | scummvm-rg350-09f77eb4642eae4e945f8c10554ce204aff450e0.tar.gz scummvm-rg350-09f77eb4642eae4e945f8c10554ce204aff450e0.tar.bz2 scummvm-rg350-09f77eb4642eae4e945f8c10554ce204aff450e0.zip | |
LOL: - fix invalid mem access
- also extend LordHoto's recent item code changes to LOL
svn-id: r53740
Diffstat (limited to 'engines/kyra/lol.cpp')
| -rw-r--r-- | engines/kyra/lol.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp index 03d52ec4ac..f6ac8a1a73 100644 --- a/engines/kyra/lol.cpp +++ b/engines/kyra/lol.cpp @@ -1930,11 +1930,11 @@ int LoLEngine::playCharacterScriptChat(int charId, int mode, int restorePortrait return 1; } -void LoLEngine::giveItemToMonster(MonsterInPlay *monster, uint16 item) { +void LoLEngine::giveItemToMonster(MonsterInPlay *monster, Item item) { uint16 *c = &monster->assignedItems; while (*c) c = &_itemsInPlay[*c].nextAssignedObject; - *c = item; + *c = (uint16)item; _itemsInPlay[item].nextAssignedObject = 0; } |