diff options
author | Travis Howell | 2002-11-28 00:22:24 +0000 |
---|---|---|
committer | Travis Howell | 2002-11-28 00:22:24 +0000 |
commit | 3c96baa2e452837988657df6b21b6b02f41bf238 (patch) | |
tree | defdee3c8212947445e30f793b1f500c9e9fe91a /simon | |
parent | 4492aebd099e5dee78281ae97ec1ee8496a12539 (diff) | |
download | scummvm-rg350-3c96baa2e452837988657df6b21b6b02f41bf238.tar.gz scummvm-rg350-3c96baa2e452837988657df6b21b6b02f41bf238.tar.bz2 scummvm-rg350-3c96baa2e452837988657df6b21b6b02f41bf238.zip |
Add Named unknown variable in simon, patch #644907
svn-id: r5733
Diffstat (limited to 'simon')
-rw-r--r-- | simon/simon.cpp | 2 | ||||
-rw-r--r-- | simon/simon.h | 4 | ||||
-rw-r--r-- | simon/vga.cpp | 14 |
3 files changed, 11 insertions, 9 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index 929bfe60ba..e7984df483 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -3659,7 +3659,7 @@ void SimonState::start_vga_code(uint b, uint vga_res, uint vga_struct_id, uint c vsp++; vsp->unk6 = b; - vsp->unk5 = 0; + vsp->priority = 0; vsp->unk4 = 0; vsp->y = d; diff --git a/simon/simon.h b/simon/simon.h index 52938daad5..3a7b495fda 100644 --- a/simon/simon.h +++ b/simon/simon.h @@ -76,7 +76,9 @@ struct VgaSprite { uint16 image; uint16 base_color; uint16 x, y; /* actually signed numbers */ - uint16 unk4, unk5, unk6, unk7; + uint16 unk4; + uint16 priority; + uint16 unk6, unk7; }; struct VgaSleepStruct { diff --git a/simon/vga.cpp b/simon/vga.cpp index 6fbe841ac1..2c1462f9d8 100644 --- a/simon/vga.cpp +++ b/simon/vga.cpp @@ -311,7 +311,7 @@ void SimonState::vc_3() vsp->base_color = e; vsp->unk6 = a; - vsp->unk5 = 0; + vsp->priority = 0; vsp->unk4 = 0; vsp->image = 0; vsp->x = c; @@ -1178,29 +1178,29 @@ void SimonState::vc_23_set_pri() } memcpy(&bak, vsp, sizeof(bak)); - bak.unk5 = pri; + bak.priority = pri; bak.unk6 |= 0x8000; vus2 = vsp; - if (vsp != _vga_sprites && pri < vsp[-1].unk5) { + if (vsp != _vga_sprites && pri < vsp[-1].priority) { do { vsp--; - } while (vsp != _vga_sprites && pri < vsp[-1].unk5); + } while (vsp != _vga_sprites && pri < vsp[-1].priority); do { memcpy(vus2, vus2 - 1, sizeof(VgaSprite)); } while (--vus2 != vsp); memcpy(vus2, &bak, sizeof(VgaSprite)); - } else if (vsp[1].id != 0 && pri >= vsp[1].unk5) { + } else if (vsp[1].id != 0 && pri >= vsp[1].priority) { do { vsp++; - } while (vsp[1].id != 0 && pri >= vsp[1].unk5); + } while (vsp[1].id != 0 && pri >= vsp[1].priority); do { memcpy(vus2, vus2 + 1, sizeof(VgaSprite)); } while (++vus2 != vsp); memcpy(vus2, &bak, sizeof(VgaSprite)); } else { - vsp->unk5 = pri; + vsp->priority = pri; } _vga_sprite_changed++; } |