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

Merged o_vga_reset() into o1_killAnimate().

Browse source 
svn-id: r21744
This commit is contained in:
Torbjörn Andersson 2006-04-10 06:51:20 +00:00
parent 46ef60e1b9
commit e67f1a9923
3 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/simon/items.cpp
View file

@ -870,7 +870,9 @@ void SimonEngine::o1_stopAnimate() {
void SimonEngine::o1_killAnimate() {
// 100: vga reset
o_vga_reset();
_lockWord |= 0x8000;
vc27_resetSprite();
_lockWord &= ~0x8000;
}
void SimonEngine::o1_defWindow() {

6
engines/simon/simon.cpp
View file

@ -2863,12 +2863,6 @@ void SimonEngine::timer_callback() {
}
}
void SimonEngine::o_vga_reset() {
_lockWord |= 0x8000;
vc27_resetSprite();
_lockWord &= ~0x8000;
}
bool SimonEngine::itemIsSiblingOf(uint16 a) {
Item *item;

1
engines/simon/simon.h
View file

@ -557,7 +557,6 @@ protected:
void o_kill_sprite_simon1(uint a);
void o_kill_sprite_simon2(uint a, uint b);
void o_vga_reset();
void changeWindow(uint a);
void o_unk_103();
void closeWindow(uint a);