diff options
| author | Travis Howell | 2003-10-21 11:45:46 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-10-21 11:45:46 +0000 |
| commit | b582881471012646f8900ba7faadb03dfadafc47 (patch) | |
| tree | 53da34488b7ddbd2be43bb3425c20f625a93e70c /simon | |
| parent | c3deeb3daf5ef009fe678b8c7ec0ede8047084ec (diff) | |
| download | scummvm-rg350-b582881471012646f8900ba7faadb03dfadafc47.tar.gz scummvm-rg350-b582881471012646f8900ba7faadb03dfadafc47.tar.bz2 scummvm-rg350-b582881471012646f8900ba7faadb03dfadafc47.zip | |
Missed one
svn-id: r10930
Diffstat (limited to 'simon')
| -rw-r--r-- | simon/simon.cpp | 4 | ||||
| -rw-r--r-- | simon/simon.h | 2 | ||||
| -rw-r--r-- | simon/vga.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index ffdc35215c..b0800409fa 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -3384,7 +3384,7 @@ VgaSprite *SimonEngine::find_cur_sprite() { return vsp; } -bool SimonEngine::has_vgastruct_with_id(uint16 id, uint16 file) { +bool SimonEngine::has_vga_sprite_with_id(uint16 id, uint16 file) { VgaSprite *vsp = _vga_sprites; while (vsp->id) { if (_game & GF_SIMON2) { @@ -3857,7 +3857,7 @@ void SimonEngine::start_vga_code(uint b, uint vga_res, uint vga_sprite_id, uint _lock_word |= 0x40; - if (has_vgastruct_with_id(vga_sprite_id, vga_res)) { + if (has_vga_sprite_with_id(vga_sprite_id, vga_res)) { _lock_word &= ~0x40; return; } diff --git a/simon/simon.h b/simon/simon.h index 46acac8873..5d825b1338 100644 --- a/simon/simon.h +++ b/simon/simon.h @@ -693,7 +693,7 @@ protected: void expire_vga_timers(); - bool has_vgastruct_with_id(uint16 id, uint16 file); + bool has_vga_sprite_with_id(uint16 id, uint16 file); bool vc_get_bit(uint bit); diff --git a/simon/vga.cpp b/simon/vga.cpp index 26972c8b13..55aa777455 100644 --- a/simon/vga.cpp +++ b/simon/vga.cpp @@ -289,7 +289,7 @@ void SimonEngine::vc_3_new_sprite() { base_color = vc_read_next_word(); /* 8 */ /* 2nd param ignored with simon1 */ - if (has_vgastruct_with_id(vga_sprite_id, f)) + if (has_vga_sprite_with_id(vga_sprite_id, f)) return; vsp = _vga_sprites; |