aboutsummaryrefslogtreecommitdiff
path: root/engines/lastexpress/game
diff options
context:
space:
mode:
authorLittleboy2012-08-01 13:55:55 -0400
committerLittleboy2012-08-01 13:55:55 -0400
commit4ad7d48fe9b306192963398668feb6332a664830 (patch)
tree7d1e643b86d9fddcade1310a7478807b7036b2cd /engines/lastexpress/game
parent7f05e1413c8b7b3913f64ddb29622dcdf40b2c65 (diff)
downloadscummvm-rg350-4ad7d48fe9b306192963398668feb6332a664830.tar.gz
scummvm-rg350-4ad7d48fe9b306192963398668feb6332a664830.tar.bz2
scummvm-rg350-4ad7d48fe9b306192963398668feb6332a664830.zip
LASTEXPRESS: Remove unused code and move functor definition to only file using it
Diffstat (limited to 'engines/lastexpress/game')
-rw-r--r--engines/lastexpress/game/action.cpp16
1 files changed, 16 insertions, 0 deletions
diff --git a/engines/lastexpress/game/action.cpp b/engines/lastexpress/game/action.cpp
index 4d1c786167..60a309518a 100644
--- a/engines/lastexpress/game/action.cpp
+++ b/engines/lastexpress/game/action.cpp
@@ -329,6 +329,22 @@ static const struct {
{"8042A", 600}
};
+template<class Arg, class Res, class T>
+class Functor1MemConst : public Common::Functor1<Arg, Res> {
+public:
+ typedef Res (T::*FuncType)(Arg) const;
+
+ Functor1MemConst(T *t, const FuncType &func) : _t(t), _func(func) {}
+
+ bool isValid() const { return _func != 0 && _t != 0; }
+ Res operator()(Arg v1) const {
+ return (_t->*_func)(v1);
+ }
+private:
+ mutable T *_t;
+ const FuncType _func;
+};
+
Action::Action(LastExpressEngine *engine) : _engine(engine) {
ADD_ACTION(dummy);
ADD_ACTION(inventory);