diff options
| author | Littleboy | 2012-07-15 14:10:39 -0400 |
|---|---|---|
| committer | Littleboy | 2012-07-16 23:51:25 -0400 |
| commit | 876a8f9377b6c5533ca81c3c358e8b74014dc93f (patch) | |
| tree | 9c4e7c4f85d2eaaf44ddb87ef2900a3a8356da84 /engines/lastexpress/entities/entity_intern.h | |
| parent | 9e64e62c08a9a170382bdeb394ad8ef39e0bb700 (diff) | |
| download | scummvm-rg350-876a8f9377b6c5533ca81c3c358e8b74014dc93f.tar.gz scummvm-rg350-876a8f9377b6c5533ca81c3c358e8b74014dc93f.tar.bz2 scummvm-rg350-876a8f9377b6c5533ca81c3c358e8b74014dc93f.zip | |
LASTEXPRESS: Replace COMPARTMENT_TO and COMPARTMENT_FROM_TO macros
Diffstat (limited to 'engines/lastexpress/entities/entity_intern.h')
| -rw-r--r-- | engines/lastexpress/entities/entity_intern.h | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/engines/lastexpress/entities/entity_intern.h b/engines/lastexpress/entities/entity_intern.h index c21f2c14e2..0613b7bb0b 100644 --- a/engines/lastexpress/entities/entity_intern.h +++ b/engines/lastexpress/entities/entity_intern.h @@ -451,66 +451,6 @@ void class::setup_##name() { \ if (!parameter) \ parameter = (uint)(type + value); -////////////////////////////////////////////////////////////////////////// -// Compartments -////////////////////////////////////////////////////////////////////////// -// Go from one compartment to another (or the same one if no optional args are passed -#define COMPARTMENT_TO(class, compartmentFrom, positionFrom, sequenceFrom, sequenceTo) \ - switch (savepoint.action) { \ - default: \ - break; \ - case kActionDefault: \ - getData()->entityPosition = positionFrom; \ - setCallback(1); \ - setup_enterExitCompartment(sequenceFrom, compartmentFrom); \ - break; \ - case kActionCallback: \ - switch (getCallback()) { \ - default: \ - break; \ - case 1: \ - setCallback(2); \ - setup_enterExitCompartment(sequenceTo, compartmentFrom); \ - break; \ - case 2: \ - getData()->entityPosition = positionFrom; \ - getEntities()->clearSequences(_entityIndex); \ - callbackAction(); \ - } \ - break; \ - } - -#define COMPARTMENT_FROM_TO(class, compartmentFrom, positionFrom, sequenceFrom, compartmentTo, positionTo, sequenceTo) \ - switch (savepoint.action) { \ - default: \ - break; \ - case kActionDefault: \ - getData()->entityPosition = positionFrom; \ - getData()->location = kLocationOutsideCompartment; \ - setCallback(1); \ - setup_enterExitCompartment(sequenceFrom, compartmentFrom); \ - break; \ - case kActionCallback: \ - switch (getCallback()) { \ - default: \ - break; \ - case 1: \ - setCallback(2); \ - setup_updateEntity(kCarGreenSleeping, positionTo); \ - break; \ - case 2: \ - setCallback(3); \ - setup_enterExitCompartment(sequenceTo, compartmentTo); \ - break; \ - case 3: \ - getData()->location = kLocationInsideCompartment; \ - getEntities()->clearSequences(_entityIndex); \ - callbackAction(); \ - break; \ - } \ - break; \ - } - } // End of namespace LastExpress #endif // LASTEXPRESS_ENTITY_INTERN_H |