libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 21:59:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* Test whether an object can be used by evaluating its canUse script (warning: this will break many things currently working until I implement IsIcoAct in my next few commits).

Browse Source 
* Removed old HACK note because look / use scripts are now more properly implemented.

svn-id: r43130
This commit is contained in:
Denis Kasak 2009-08-08 16:17:21 +00:00
parent 18b5d7ce33
commit c193c80e67
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
engines/draci/game.cpp
View File

@ -277,7 +277,7 @@ void Game::loop() {
}
if (_loopSubstatus == kStatusOrdinary) {
// HACK: Test running look and use scripts
if (_vm->_mouse->lButtonPressed()) {
// Delete title text
title->setText("");
@ -297,23 +297,30 @@ void Game::loop() {
_vm->_mouse->cursorOn();
}
// TODO: Handle global use scripts (the use script for the room itself)
if (_vm->_mouse->rButtonPressed()) {
// Delete title text
title->setText("");
_vm->_mouse->cursorOff();
_vm->_mouse->rButtonSet(false);
if (!obj->_imUse) {
if (obj->_useDir == 0) {
walkHero(x, y);
} else {
walkHero(obj->_useX, obj->_useY);
}
}
if (_vm->_script->testExpression(obj->_program, obj->_canUse)) {
_vm->_mouse->cursorOff();
_vm->_script->run(obj->_program, obj->_use);
_vm->_mouse->cursorOn();
if (!obj->_imUse) {
if (obj->_useDir == 0) {
walkHero(x, y);
} else {
walkHero(obj->_useX, obj->_useY);
}
}
_vm->_script->run(obj->_program, obj->_use);
_vm->_mouse->cursorOn();
} else {
walkHero(x, y);
}
}
}
} else {