libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-19 02:38:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DIRECTOR: LINGO: Rename dontPassEvent and simplify code

Browse Source
This commit is contained in:
Eugene Sandulenko 2019-12-18 14:50:40 +01:00
parent 98b8b8d730
commit 1d1f09f072
4 changed files with 49 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/director/lingo/lingo-builtins.cpp
View File

@ -871,7 +871,7 @@ void Lingo::b_continue(int nargs) {
}
void Lingo::b_dontPassEvent(int nargs) {
g_lingo->dontPassEvent = true;
g_lingo->_dontPassEvent = true;
warning("dontPassEvent raised");
}

85
engines/director/lingo/lingo-events.cpp
View File

@ -132,7 +132,7 @@ void Lingo::primaryEventHandler(LEvent event) {
}
#ifdef DEBUG_DONTPASSEVENT
// #define DEBUG_DONTPASSEVENT to simulate raising of the dontPassEvent flag
g_lingo->dontPassEvent = true;
g_lingo->_dontPassEvent = true;
debugC(3, kDebugLingoExec, "STUB: primaryEventHandler raising dontPassEvent");
#else
debugC(3, kDebugLingoExec, "STUB: primaryEventHandler not raising dontPassEvent");
@ -157,32 +157,35 @@ void Lingo::processInputEvent(LEvent event) {
primaryEventHandler(event);
if (g_lingo->dontPassEvent) {
g_lingo->dontPassEvent = false;
} else {
if (_vm->getVersion() > 3) {
if (true) {
// TODO: Check whether occurring over a sprite
g_lingo->processEvent(event, kSpriteScript, currentFrame->_sprites[spriteId]->_scriptId);
}
g_lingo->processEvent(event, kCastScript, currentFrame->_sprites[spriteId]->_castId);
g_lingo->processEvent(event, kFrameScript, score->_frames[score->getCurrentFrame()]->_actionId);
// TODO: Is the kFrameScript call above correct?
} else if (event == kEventMouseUp) {
// Frame script overrides sprite script
if (!currentFrame->_sprites[spriteId]->_scriptId) {
g_lingo->processEvent(kEventNone, kSpriteScript, currentFrame->_sprites[spriteId]->_castId + 1024);
g_lingo->processEvent(event, kSpriteScript, currentFrame->_sprites[spriteId]->_castId + 1024);
} else {
g_lingo->processEvent(kEventNone, kFrameScript, currentFrame->_sprites[spriteId]->_scriptId);
}
}
if (event == kEventKeyDown) {
// TODO: is the above condition necessary or useful?
g_lingo->processEvent(event, kGlobalScript, 0);
}
runMovieScript(event);
if (g_lingo->_dontPassEvent) {
g_lingo->_dontPassEvent = false;
return;
}
if (_vm->getVersion() > 3) {
if (true) {
// TODO: Check whether occurring over a sprite
g_lingo->processEvent(event, kSpriteScript, currentFrame->_sprites[spriteId]->_scriptId);
}
g_lingo->processEvent(event, kCastScript, currentFrame->_sprites[spriteId]->_castId);
g_lingo->processEvent(event, kFrameScript, score->_frames[score->getCurrentFrame()]->_actionId);
// TODO: Is the kFrameScript call above correct?
} else if (event == kEventMouseUp) {
// Frame script overrides sprite script
if (!currentFrame->_sprites[spriteId]->_scriptId) {
g_lingo->processEvent(kEventNone, kSpriteScript, currentFrame->_sprites[spriteId]->_castId + 1024);
g_lingo->processEvent(event, kSpriteScript, currentFrame->_sprites[spriteId]->_castId + 1024);
} else {
g_lingo->processEvent(kEventNone, kFrameScript, currentFrame->_sprites[spriteId]->_scriptId);
}
}
if (event == kEventKeyDown) {
// TODO: is the above condition necessary or useful?
g_lingo->processEvent(event, kGlobalScript, 0);
}
if (!g_lingo->_dontPassEvent)
runMovieScript(event);
}
void Lingo::runMovieScript(LEvent event) {
@ -214,22 +217,24 @@ void Lingo::processFrameEvent(LEvent event) {
primaryEventHandler(event);
}
if (g_lingo->dontPassEvent) {
g_lingo->dontPassEvent = false;
} else {
int entity;
if (g_lingo->_dontPassEvent) {
g_lingo->_dontPassEvent = false;
if (event == kEventPrepareFrame || event == kEventIdle) {
entity = score->getCurrentFrame();
} else {
assert(score->_frames[score->getCurrentFrame()] != nullptr);
entity = score->_frames[score->getCurrentFrame()]->_actionId;
}
processEvent(event,
kFrameScript,
entity);
runMovieScript(event);
return;
}
int entity;
if (event == kEventPrepareFrame || event == kEventIdle) {
entity = score->getCurrentFrame();
} else {
assert(score->_frames[score->getCurrentFrame()] != nullptr);
entity = score->_frames[score->getCurrentFrame()]->_actionId;
}
processEvent(event, kFrameScript, entity);
if (!g_lingo->_dontPassEvent)
runMovieScript(event);
}
void Lingo::processGenericEvent(LEvent event) {

2
engines/director/lingo/lingo.cpp
View File

@ -70,6 +70,8 @@ Lingo::Lingo(DirectorEngine *vm) : _vm(vm) {
_localvars = NULL;
_dontPassEvent = false;
initEventHandlerTypes();
initBuiltIns();

2
engines/director/lingo/lingo.h
View File

@ -620,7 +620,7 @@ private:
int _floatPrecision;
bool dontPassEvent;
bool _dontPassEvent;
public:
void executeImmediateScripts(Frame *frame);