diff options
| author | Julien | 2012-07-24 22:24:59 -0400 |
|---|---|---|
| committer | Julien | 2012-07-27 00:15:01 -0400 |
| commit | 7450ae23fb3c7afcaa33a35390e4c2c03238a024 (patch) | |
| tree | cdd52e225fd6b4ccbbc3c0493502f517c4905600 | |
| parent | 7974b62b716343ff979447957b140f8e2b79f03c (diff) | |
| download | scummvm-rg350-7450ae23fb3c7afcaa33a35390e4c2c03238a024.tar.gz scummvm-rg350-7450ae23fb3c7afcaa33a35390e4c2c03238a024.tar.bz2 scummvm-rg350-7450ae23fb3c7afcaa33a35390e4c2c03238a024.zip | |
LASTEXPRESS: Move RESET_ENTITY_STATE macro to entity.h
| -rw-r--r-- | engines/lastexpress/entities/entity.h | 8 | ||||
| -rw-r--r-- | engines/lastexpress/entities/entity_intern.h | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/engines/lastexpress/entities/entity.h b/engines/lastexpress/entities/entity.h index 6e55e21b74..785e355481 100644 --- a/engines/lastexpress/entities/entity.h +++ b/engines/lastexpress/entities/entity.h @@ -94,6 +94,14 @@ struct SavePoint; #define ENTITY_PARAM(index, id) \ ((EntityData::EntityParametersIIII*)_data->getParameters(8, index))->param##id +////////////////////////////////////////////////////////////////////////// +// Misc +////////////////////////////////////////////////////////////////////////// +#define RESET_ENTITY_STATE(entity, class, function) \ + getEntities()->resetState(entity); \ + ((class *)getEntities()->get(entity))->function(); + + ////////////////////////////////////////////////////////////////////////// class EntityData : Common::Serializable { diff --git a/engines/lastexpress/entities/entity_intern.h b/engines/lastexpress/entities/entity_intern.h index 1d6c462a88..306dbf8376 100644 --- a/engines/lastexpress/entities/entity_intern.h +++ b/engines/lastexpress/entities/entity_intern.h @@ -260,13 +260,6 @@ void class::setup_##name() { \ ////////////////////////////////////////////////////////////////////////// -// Misc -////////////////////////////////////////////////////////////////////////// -#define RESET_ENTITY_STATE(entity, class, function) \ - getEntities()->resetState(entity); \ - ((class *)getEntities()->get(entity))->function(); - -////////////////////////////////////////////////////////////////////////// // Time check macros ////////////////////////////////////////////////////////////////////////// #define TIME_CHECK_CALLBACK_1(timeValue, parameter, callback, function, param1) \ |