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

Cleanup.

Browse source 
svn-id: r19259
This commit is contained in:
Travis Howell 2005-10-23 11:17:15 +00:00
parent 2e6b615c91
commit cd8533d722
3 changed files with 20 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

11
simon/items.cpp
View file

@ -1622,17 +1622,10 @@ void SimonEngine::o_play_music_resource() {
void SimonEngine::o_unk_120(uint a) { void SimonEngine::o_unk_120(uint a) {
uint16 id = TO_BE_16(a); uint16 id = TO_BE_16(a);
if (_game & GF_SIMON2) {
_lockWord |= 0x8000; _lockWord |= 0x8000;
_vcPtr = (byte *)&id; _vcPtr = (byte *)&id;
vc15_wakeup_id(); vc15_wakeup_id();
_lockWord &= ~0x8000; _lockWord &= ~0x8000;
} else {
_lockWord |= 0x4000;
_vcPtr = (byte *)&id;
vc15_wakeup_id();
_lockWord &= ~0x4000;
}
} }
void SimonEngine::o_play_sound(uint sound_id) { void SimonEngine::o_play_sound(uint sound_id) {
@ -1655,10 +1648,10 @@ void SimonEngine::o_unk_103() {
void SimonEngine::o_kill_sprite_simon1(uint a) { void SimonEngine::o_kill_sprite_simon1(uint a) {
uint16 b = TO_BE_16(a); uint16 b = TO_BE_16(a);
_lockWord |= 0x4000; _lockWord |= 0x8000;
_vcPtr = (byte *)&b; _vcPtr = (byte *)&b;
vc60_killSprite(); vc60_killSprite();
_lockWord &= ~0x4000; _lockWord &= ~0x8000;
} }
void SimonEngine::o_kill_sprite_simon2(uint a, uint b) { void SimonEngine::o_kill_sprite_simon2(uint a, uint b) {

19
simon/simon.cpp
View file

@ -2744,15 +2744,9 @@ void SimonEngine::o_force_unlock() {
} }
void SimonEngine::o_force_lock() { void SimonEngine::o_force_lock() {
if (_game & GF_SIMON2) {
_lockWord |= 0x8000; _lockWord |= 0x8000;
vc34_setMouseOff(); vc34_setMouseOff();
_lockWord &= ~0x8000; _lockWord &= ~0x8000;
} else {
_lockWord |= 0x4000;
vc34_setMouseOff();
_lockWord &= ~0x4000;
}
} }
void SimonEngine::o_wait_for_vga(uint a) { void SimonEngine::o_wait_for_vga(uint a) {
@ -2924,13 +2918,8 @@ void SimonEngine::timer_vga_sprites_2() {
void SimonEngine::timer_proc1() { void SimonEngine::timer_proc1() {
_timer4++; _timer4++;
if (_game & GF_SIMON2) {
if (_lockWord & 0x80E9 || _lockWord & 2) if (_lockWord & 0x80E9 || _lockWord & 2)
return; return;
} else {
if (_lockWord & 0xC0E9 || _lockWord & 2)
return;
}
_timer1++; _timer1++;
@ -2944,7 +2933,7 @@ void SimonEngine::timer_proc1() {
if (!_cepeFlag) if (!_cepeFlag)
expire_vga_timers(); expire_vga_timers();
if (_lockCounter != 0 && !_syncFlag2) { if (_lockCounter != 0 && _syncFlag2) {
_lockWord &= ~2; _lockWord &= ~2;
return; return;
} }
@ -2987,15 +2976,9 @@ void SimonEngine::fcs_setTextColor(FillOrCopyStruct *fcs, uint value) {
} }
void SimonEngine::o_vga_reset() { void SimonEngine::o_vga_reset() {
if (_game & GF_SIMON2) {
_lockWord |= 0x8000; _lockWord |= 0x8000;
vc27_resetSprite(); vc27_resetSprite();
_lockWord &= ~0x8000; _lockWord &= ~0x8000;
} else {
_lockWord |= 0x4000;
vc27_resetSprite();
_lockWord &= ~0x4000;
}
} }
bool SimonEngine::itemIsSiblingOf(uint16 a) { bool SimonEngine::itemIsSiblingOf(uint16 a) {

10
simon/vga.cpp
View file

@ -225,9 +225,9 @@ void SimonEngine::o_read_vgares_23() {
// Simon1 Only // Simon1 Only
if (_vgaRes328Loaded == true) { if (_vgaRes328Loaded == true) {
_vgaRes328Loaded = false; _vgaRes328Loaded = false;
_lockWord |= 0x4000; _lockWord |= 0x8000;
read_vga_from_datfile_1(23); read_vga_from_datfile_1(23);
_lockWord &= ~0x4000; _lockWord &= ~0x8000;
} }
} }
@ -235,9 +235,9 @@ void SimonEngine::o_read_vgares_328() {
// Simon1 Only // Simon1 Only
if (_vgaRes328Loaded == false) { if (_vgaRes328Loaded == false) {
_vgaRes328Loaded = true; _vgaRes328Loaded = true;
_lockWord |= 0x4000; _lockWord |= 0x8000;
read_vga_from_datfile_1(328); read_vga_from_datfile_1(328);
_lockWord &= ~0x4000; _lockWord &= ~0x8000;
} }
} }
@ -866,7 +866,7 @@ void SimonEngine::vc10_draw() {
} while (++w != state.draw_width); } while (++w != state.draw_width);
/* vc10_helper_5 */ /* vc10_helper_5 */
} else if (_lockWord & 0x20 && state.palette == 0 || state.palette == 0xC0) { } else if (((_lockWord & 0x20) && state.palette == 0) || state.palette == 0xC0) {
const byte *src; const byte *src;
byte *dst; byte *dst;
uint h, i; uint h, i;