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

Apply three patches:

Browse source 
593567 [painelf]: Fix SNM inventory icon centering, it's an actor
593444 [wjp and eriktorbjorn]: Simon2 lockup fix
593455 [wjp]: Simon2 map fix

svn-id: r4725
This commit is contained in:
James Brown 2002-08-11 09:05:30 +00:00
parent 99e11501f4
commit 3ba577842b
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
script_v2.cpp
View file

@ -1503,7 +1503,7 @@ void Scumm::o6_loadRoomWithEgo()
/* startScene maybe modifies VAR_EGO, i hope not */ /* startScene maybe modifies VAR_EGO, i hope not */
if (!(_features & GF_AFTER_V7)) { if (!(_features & GF_AFTER_V7)) {
camera._dest.x = camera._cur.x = a->x; setCameraAt(a->x, a->y);
setCameraFollows(a); setCameraFollows(a);
} }
_fullRedraw = 1; _fullRedraw = 1;

4
simon/simon.cpp
View file

@ -3432,8 +3432,10 @@ void SimonState::start_vga_code(uint b, uint vga_res, uint vga_struct_id, uint c
_lock_word |= 0x40; _lock_word |= 0x40;
if (has_vgastruct_with_id(vga_struct_id, vga_res)) if (has_vgastruct_with_id(vga_struct_id, vga_res)) {
_lock_word &= ~0x40;
return; return;
}
vsp = _vga_sprites; vsp = _vga_sprites;
while (vsp->id != 0) while (vsp->id != 0)

2
simon/simonitems.cpp
View file

@ -1601,7 +1601,7 @@ void SimonState::o_unk_99_simon2(uint a, uint b)
uint16 items[2]; uint16 items[2];
items[0] = TO_BE_16(a); items[0] = TO_BE_16(a);
items[1] = TO_BE_16(a); items[1] = TO_BE_16(b);
_lock_word |= 0x4000; _lock_word |= 0x4000;
_vc_ptr = (byte *)&items; _vc_ptr = (byte *)&items;