diff options
| author | Eugene Sandulenko | 2016-01-03 19:06:15 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-01-03 19:06:15 +0100 |
| commit | 07d11b4af695e7fdc2d3d686f3d24e60387bb749 (patch) | |
| tree | 8c1735c418b5bcac59c7195cfe00d258f713cb79 /engines/wage/script.cpp | |
| parent | 6233e429f33822758f2316f29fb4158797683cf2 (diff) | |
| download | scummvm-rg350-07d11b4af695e7fdc2d3d686f3d24e60387bb749.tar.gz scummvm-rg350-07d11b4af695e7fdc2d3d686f3d24e60387bb749.tar.bz2 scummvm-rg350-07d11b4af695e7fdc2d3d686f3d24e60387bb749.zip | |
WAGE: Complete Script::compare()
Diffstat (limited to 'engines/wage/script.cpp')
| -rw-r--r-- | engines/wage/script.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/engines/wage/script.cpp b/engines/wage/script.cpp index 9bd9397904..8dde95ea55 100644 --- a/engines/wage/script.cpp +++ b/engines/wage/script.cpp @@ -575,15 +575,20 @@ bool Script::compare(Operand *o1, Operand *o2, int comparator) { case kCompEqNumNum: return o1->_value.number == o2->_value.number; case kCompEqObjScene: - error("FIXME kCompEqObjScene"); - //return o2->_value.scene->_objs.contains(*o1->_value.obj); + for (Common::List<Obj *>::const_iterator it = o2->_value.scene->_objs.begin(); it != o2->_value.scene->_objs.end(); ++it) + if (*it == o1->_value.obj) + return true; + return false; case kCompEqChrScene: - error("FIXME kCompEqChrScene"); - //return o2->_value.scene->_chrs.contains(*o1->_value.chr); + for (Common::List<Chr *>::const_iterator it = o2->_value.scene->_chrs.begin(); it != o2->_value.scene->_chrs.end(); ++it) + if (*it == o1->_value.chr) + return true; + return false; case kCompEqObjChr: - warning("FIXME kCompEqObjChr"); + for (Common::Array<Obj *>::const_iterator it = o2->_value.chr->_inventory.begin(); it != o2->_value.chr->_inventory.end(); ++it) + if (*it == o1->_value.obj) + return true; return false; - //return o2->_value.chr->_inventory.contains(*o1->_value.obj); case kCompEqChrChr: return o1->_value.chr == o2->_value.chr; case kCompEqSceneScene: |