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

Merged o_loadZone() and o_unloadZone() into o1_loadZone() and o1_unloadZone().

Browse source 
svn-id: r21752
This commit is contained in:
Torbjörn Andersson 2006-04-10 08:00:29 +00:00
parent d76cbb8439
commit e931f9d07d
3 changed files with 11 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

13
engines/simon/items.cpp
View file

@ -856,7 +856,11 @@ void SimonEngine::o1_picture() {
void SimonEngine::o1_loadZone() {
// 97: load vga
o_loadZone(getVarOrWord());
uint vga_res = getVarOrWord();
_lockWord |= 0x80;
loadZone(vga_res);
_lockWord &= ~0x80;
}
void SimonEngine::o1_animate() {
@ -1401,7 +1405,12 @@ void SimonEngine::o1_unloadBeard() {
void SimonEngine::o1_unloadZone() {
// 184: clear vgapointer entry
o_unloadZone(getVarOrWord());
uint a = getVarOrWord();
VgaPointersEntry *vpe = &_vgaBufferPointers[a];
vpe->sfxFile = NULL;
vpe->vgaFile1 = NULL;
vpe->vgaFile2 = NULL;
}
void SimonEngine::o1_loadStrings() {

16
engines/simon/simon.cpp
View file

@ -2172,12 +2172,6 @@ void SimonEngine::o_printStr() {
}
void SimonEngine::o_loadZone(uint vga_res) {
_lockWord |= 0x80;
loadZone(vga_res);
_lockWord &= ~0x80;
}
void SimonEngine::loadZone(uint vga_res) {
VgaPointersEntry *vpe;
@ -2296,16 +2290,6 @@ void SimonEngine::vga_buf_unk_proc2(uint a, byte *end) {
}
}
void SimonEngine::o_unloadZone(uint a) {
VgaPointersEntry *vpe;
vpe = &_vgaBufferPointers[a];
vpe->sfxFile = NULL;
vpe->vgaFile1 = NULL;
vpe->vgaFile2 = NULL;
}
void SimonEngine::set_video_mode_internal(uint mode, uint vga_res_id) {
uint num, num_lines;
VgaPointersEntry *vpe;

2
engines/simon/simon.h
View file

@ -586,7 +586,6 @@ protected:
void o_pathfind(int x, int y, uint var_1, uint var_2);
void o_mouseOn();
void o_mouseOff();
void o_unloadZone(uint a);
void o_unfreezeBottom();
void o_fadeToBlack();
@ -688,7 +687,6 @@ protected:
void set_video_mode_internal(uint mode, uint vga_res_id);
void o_loadZone(uint vga_res);
void loadZone(uint vga_res);
void loadSprite(uint windowNum, uint vga_res, uint vga_sprite_id, uint x, uint y, uint palette);