libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 06:08:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add timer difference in FF

Browse Source 
svn-id: r22054
This commit is contained in:
Travis Howell 2006-04-20 08:58:30 +00:00
parent 25ca897466
commit 948301faaf
3 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
engines/simon/simon.cpp
View File

@ -523,7 +523,6 @@ int SimonEngine::init() {
// FIXME Use auto dirty rects cleanup code to reduce CPU usage
g_system->setFeatureState(OSystem::kFeatureAutoComputeDirtyRects, true);
VGA_DELAY_BASE = 1;
if (getGameType() == GType_FF) {
NUM_VIDEO_OP_CODES = 85;
#ifndef PALMOS_68K
@ -532,6 +531,7 @@ int SimonEngine::init() {
VGA_MEM_SIZE = gVars->memory[kMemSimon2Games];
#endif
TABLES_MEM_SIZE = 200000;
VGA_DELAY_BASE = 5;
} else if (getGameType() == GType_SIMON2) {
TABLE_INDEX_BASE = 1580 / 4;
TEXT_INDEX_BASE = 1500 / 4;
@ -548,6 +548,7 @@ int SimonEngine::init() {
else
MUSIC_INDEX_BASE = 1128 / 4;
SOUND_INDEX_BASE = 1660 / 4;
VGA_DELAY_BASE = 1;
} else {
TABLE_INDEX_BASE = 1576 / 4;
TEXT_INDEX_BASE = 1460 / 4;
@ -560,6 +561,7 @@ int SimonEngine::init() {
TABLES_MEM_SIZE = 50000;
MUSIC_INDEX_BASE = 1316 / 4;
SOUND_INDEX_BASE = 0;
VGA_DELAY_BASE = 1;
}
if (getGameType() == GType_FF) {
@ -2414,11 +2416,13 @@ void SimonEngine::delete_vga_timer(VgaTimerEntry * vte) {
void SimonEngine::expire_vga_timers() {
VgaTimerEntry *vte = _vgaTimerList;
uint timer = (getGameType() == GType_FF) ? 5 : 1;
_vgaTickCounter++;
while (vte->delay) {
if (!--vte->delay) {
vte->delay -= timer;
if (vte->delay <= 0) {
uint16 cur_file = vte->cur_vga_file;
uint16 cur_sprite = vte->sprite_id;
const byte *script_ptr = vte->script_pointer;
@ -2731,16 +2735,23 @@ void SimonEngine::timer_proc1() {
_lockWord |= 2;
if (!(_lockWord & 0x10)) {
expire_vga_timers();
expire_vga_timers();
_syncFlag2 ^= 1;
_cepeFlag ^= 1;
if (!_cepeFlag)
expire_vga_timers();
if (getGameType() == GType_FF) {
_syncFlag2 ^= 1;
if (_mouseHideCount != 0 && _syncFlag2) {
_lockWord &= ~2;
return;
if (!_syncFlag2)
expire_vga_timers();
} else {
expire_vga_timers();
expire_vga_timers();
_syncFlag2 ^= 1;
_cepeFlag ^= 1;
if (!_cepeFlag)
expire_vga_timers();
if (_mouseHideCount != 0 && _syncFlag2) {
_lockWord &= ~2;
return;
}
}
}

2
engines/simon/simon.h
View File

@ -103,7 +103,7 @@ struct VgaSleepStruct {
};
struct VgaTimerEntry {
uint16 delay;
int16 delay;
const byte *script_pointer;
uint16 sprite_id;
uint16 cur_vga_file;

8
engines/simon/vga.cpp
View File

@ -1421,10 +1421,12 @@ void SimonEngine::vc12_delay() {
VgaSprite *vsp = findCurSprite();
uint num;
if (getGameType() == GType_SIMON1) {
num = vcReadVarOrWord();
} else {
if (getGameType() == GType_FF) {
num = vcReadNextByte();
} else if (getGameType() == GType_SIMON2) {
num = vcReadNextByte() * _frameRate;
} else {
num = vcReadVarOrWord();
}
// Work around to allow inventory arrows to be