libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-22 09:49:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged o_restoreIconArray() into o1_restoreIconArray().

Browse Source 
svn-id: r21756
This commit is contained in:
Torbjörn Andersson 2006-04-10 08:28:29 +00:00
parent 008d4955dd
commit 1d9cd5ad7d
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
engines/simon/items.cpp
View File

@ -1190,7 +1190,10 @@ void SimonEngine::o1_copysf() {
void SimonEngine::o1_restoreIcons() { void SimonEngine::o1_restoreIcons() {
// 137 // 137
o_restoreIconArray(getVarOrByte()); uint num = getVarOrByte();
WindowBlock *window = _windowArray[num & 7];
if (window->iconPtr)
drawIconArray(num, window->iconPtr->itemRef, window->iconPtr->line, window->iconPtr->classMask);
} }
void SimonEngine::o1_freezeZones() { void SimonEngine::o1_freezeZones() {
@ -1954,15 +1957,6 @@ void SimonEngine::o_waitForMark(uint i) {
} }
} }
void SimonEngine::o_restoreIconArray(uint num) {
WindowBlock *window;
window = _windowArray[num & 7];
if (window->iconPtr == NULL)
return;
drawIconArray(num, window->iconPtr->itemRef, window->iconPtr->line, window->iconPtr->classMask);
}
void SimonEngine::o_freezeBottom() { void SimonEngine::o_freezeBottom() {
_vgaBufStart = _vgaBufFreeStart; _vgaBufStart = _vgaBufFreeStart;
_vgaFileBufOrg = _vgaBufFreeStart; _vgaFileBufOrg = _vgaBufFreeStart;

1
engines/simon/simon.h
View File

@ -574,7 +574,6 @@ protected:
void o_waitForSync(uint a); void o_waitForSync(uint a);
void skipSpeech(); void skipSpeech();
void o_sync(uint a); void o_sync(uint a);
void o_restoreIconArray(uint a);
void o_freezeBottom(); void o_freezeBottom();
void killAllTimers(); void killAllTimers();