libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-11-30 12:50:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

LASTEXPRESS: Remove unused code and move functor definition to only file using it

Browse Source
This commit is contained in:
Littleboy 2012-08-01 13:55:55 -04:00
parent 7f05e1413c
commit 4ad7d48fe9
2 changed files with 16 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engines/lastexpress/game/action.cpp
View File

@ -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);

56
engines/lastexpress/shared.h
View File

@ -1733,62 +1733,6 @@ enum ActionIndex {
kActionEnd
};
//////////////////////////////////////////////////////////////////////////
// Functors classes used by the engine
//////////////////////////////////////////////////////////////////////////
// FIXME is this achievable with the existing Functor1Mem function
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;
};
// FIXME move this to existing func.h file
template<class Arg1, class Arg2, class Arg3, class Arg4, class Result>
struct QuaternaryFunction {
typedef Arg1 FirstArgumentType;
typedef Arg2 SecondArgumentType;
typedef Arg3 ThirdArgumentType;
typedef Arg4 FourthArgumentType;
typedef Result ResultType;
};
template<class Arg1, class Arg2, class Arg3, class Arg4, class Res>
struct Functor4 : public QuaternaryFunction<Arg1, Arg2, Arg3, Arg4, Res> {
virtual ~Functor4() {}
virtual bool isValid() const = 0;
virtual Res operator()(Arg1, Arg2, Arg3, Arg4) const = 0;
};
template<class Arg1, class Arg2, class Arg3, class Arg4, class Res, class T>
class Functor4Mem : public Functor4<Arg1, Arg2, Arg3, Arg4, Res> {
public:
typedef Res (T::*FuncType)(Arg1, Arg2, Arg3, Arg4);
Functor4Mem(T *t, const FuncType &func) : _t(t), _func(func) {}
bool isValid() const { return _func != 0 && _t != 0; }
Res operator()(Arg1 v1, Arg2 v2, Arg3 v3, Arg4 v4) const {
return (_t->*_func)(v1, v2, v3, v4);
}
private:
mutable T *_t;
const FuncType _func;
};
} // End of namespace LastExpress
#endif // LASTEXPRESS_SHARED_H