aboutsummaryrefslogtreecommitdiff
path: root/engines/adl/adl.h
diff options
context:
space:
mode:
authorWalter van Niftrik2018-12-27 12:56:47 +0100
committerWalter van Niftrik2018-12-27 12:56:47 +0100
commit52c66f5efdc236fde511431595ee3e44a4415b12 (patch)
tree7a6ddbf81c6e5a719854451698603ce726b7e87e /engines/adl/adl.h
parent76a0c20481bd68d60d8347fd922a74b292421d51 (diff)
downloadscummvm-rg350-52c66f5efdc236fde511431595ee3e44a4415b12.tar.gz
scummvm-rg350-52c66f5efdc236fde511431595ee3e44a4415b12.tar.bz2
scummvm-rg350-52c66f5efdc236fde511431595ee3e44a4415b12.zip
Revert "ADL: Refactor opcode tables"
This reverts commit 76a0c20481bd68d60d8347fd922a74b292421d51.
Diffstat (limited to 'engines/adl/adl.h')
-rw-r--r--engines/adl/adl.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/engines/adl/adl.h b/engines/adl/adl.h
index 24b6ead8d9..143b07471c 100644
--- a/engines/adl/adl.h
+++ b/engines/adl/adl.h
@@ -284,13 +284,6 @@ protected:
void loadDroppedItemOffsets(Common::ReadStream &stream, byte count);
// Opcodes
- typedef Common::Functor1<ScriptEnv &, int> Opcode;
-
- template <class T>
- Opcode *opcode(int (T::*f)(ScriptEnv &)) {
- return new Common::Functor1Mem<ScriptEnv &, int, T>(static_cast<T *>(this), f);
- }
-
int o1_isItemInRoom(ScriptEnv &e);
int o1_isMovesGT(ScriptEnv &e);
int o1_isVarEQ(ScriptEnv &e);
@@ -364,6 +357,7 @@ protected:
bool _textMode;
// Opcodes
+ typedef Common::Functor1<ScriptEnv &, int> Opcode;
Common::Array<const Opcode *> _condOpcodes, _actOpcodes;
// Message strings in data file
Common::Array<DataBlockPtr> _messages;