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

ZVISION: Process events for controls similar to original engine, fix some errors.

Browse source
This commit is contained in:
Marisa-Chan 2014-07-05 17:27:08 +00:00
parent 628d6cb4ee
commit bbaebdf680
4 changed files with 45 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

33
engines/zvision/scripting/script_manager.cpp
View file

@ -51,6 +51,7 @@ ScriptManager::~ScriptManager() {
cleanScriptScope(world);
cleanScriptScope(room);
cleanScriptScope(nodeview);
_controlEvents.clear();
}
void ScriptManager::initialize() {
@ -66,6 +67,8 @@ void ScriptManager::initialize() {
parseScrFile("universe.scr", universe);
changeLocation('g', 'a', 'r', 'y', 0);
_controlEvents.clear();
}
void ScriptManager::update(uint deltaTimeMillis) {
@ -151,6 +154,32 @@ void ScriptManager::updateNodes(uint deltaTimeMillis) {
void ScriptManager::updateControls(uint deltaTimeMillis) {
if (!_activeControls)
return;
// Process only one event
if (!_controlEvents.empty()) {
Common::Event _event = _controlEvents.front();
Common::Point imageCoord;
switch (_event.type) {
case Common::EVENT_LBUTTONDOWN:
imageCoord = _engine->getRenderManager()->screenSpaceToImageSpace(_event.mouse);
onMouseDown(_event.mouse, imageCoord);
break;
case Common::EVENT_LBUTTONUP:
imageCoord = _engine->getRenderManager()->screenSpaceToImageSpace(_event.mouse);
onMouseUp(_event.mouse, imageCoord);
break;
case Common::EVENT_KEYDOWN:
onKeyDown(_event.kbd);
break;
case Common::EVENT_KEYUP:
onKeyUp(_event.kbd);
break;
default:
break;
}
_controlEvents.pop_front();
}
for (ControlList::iterator iter = _activeControls->begin(); iter != _activeControls->end(); iter++)
(*iter)->process(deltaTimeMillis);
}
@ -693,6 +722,10 @@ Location ScriptManager::getCurrentLocation() const {
return location;
}
void ScriptManager::addEvent(Common::Event event) {
_controlEvents.push_back(event);
}
ValueSlot::ValueSlot(ScriptManager *sc_man, const char *slot_val):
_sc_man(sc_man) {
value = 0;