diff options
| author | Littleboy | 2012-07-16 23:14:14 -0400 |
|---|---|---|
| committer | Littleboy | 2012-07-16 23:51:30 -0400 |
| commit | 3cf7e8ccf347fd57a82eb5df39ac4941a4f6c2b1 (patch) | |
| tree | 46509d0c5f67e1cdc9b6ea47060558e96dfb44a5 | |
| parent | 04a181a787befb9ef5bc2a3d524f622a5fcfaeeb (diff) | |
| download | scummvm-rg350-3cf7e8ccf347fd57a82eb5df39ac4941a4f6c2b1.tar.gz scummvm-rg350-3cf7e8ccf347fd57a82eb5df39ac4941a4f6c2b1.tar.bz2 scummvm-rg350-3cf7e8ccf347fd57a82eb5df39ac4941a4f6c2b1.zip | |
LASTEXPRESS: Replace INCREMENT_DIRECTION_COUNTER macro
| -rw-r--r-- | engines/lastexpress/game/entities.cpp | 19 | ||||
| -rw-r--r-- | engines/lastexpress/game/entities.h | 1 |
2 files changed, 11 insertions, 9 deletions
diff --git a/engines/lastexpress/game/entities.cpp b/engines/lastexpress/game/entities.cpp index f2201ac9a7..4cdefcd334 100644 --- a/engines/lastexpress/game/entities.cpp +++ b/engines/lastexpress/game/entities.cpp @@ -669,11 +669,12 @@ void Entities::executeCallbacks() { ////////////////////////////////////////////////////////////////////////// // Processing ////////////////////////////////////////////////////////////////////////// -#define INCREMENT_DIRECTION_COUNTER() { \ - data->doProcessEntity = false; \ - if (data->direction == kDirectionRight || (data->direction == kDirectionSwitch && data->directionSwitch == kDirectionRight)) \ - ++data->field_4A1; \ - } +void Entities::incrementDirectionCounter(EntityData::EntityCallData *data) { + data->doProcessEntity = false; + + if (data->direction == kDirectionRight || (data->direction == kDirectionSwitch && data->directionSwitch == kDirectionRight)) + ++data->field_4A1; +} void Entities::processEntity(EntityIndex entityIndex) { EntityData::EntityCallData *data = getData(entityIndex); @@ -692,7 +693,7 @@ void Entities::processEntity(EntityIndex entityIndex) { getScenes()->removeAndRedraw(&data->frame, false); getScenes()->removeAndRedraw(&data->frame1, false); - INCREMENT_DIRECTION_COUNTER(); + incrementDirectionCounter(data); return; } @@ -722,7 +723,7 @@ label_nosequence: processFrame(entityIndex, false, true); if (!getFlags()->flag_entities_0 && !data->doProcessEntity) { - INCREMENT_DIRECTION_COUNTER(); + incrementDirectionCounter(data); return; } } else { @@ -740,7 +741,7 @@ label_nosequence: data->position = 0; } - INCREMENT_DIRECTION_COUNTER(); + incrementDirectionCounter(data); } return; } @@ -789,7 +790,7 @@ label_nosequence: } } - INCREMENT_DIRECTION_COUNTER(); + incrementDirectionCounter(data); } void Entities::computeCurrentFrame(EntityIndex entityIndex) const { diff --git a/engines/lastexpress/game/entities.h b/engines/lastexpress/game/entities.h index eb5eae461f..a9de7931f0 100644 --- a/engines/lastexpress/game/entities.h +++ b/engines/lastexpress/game/entities.h @@ -344,6 +344,7 @@ private: uint _positions[_positionsCount]; void executeCallbacks(); + void incrementDirectionCounter(EntityData::EntityCallData *data); void processEntity(EntityIndex entity); void drawSequence(EntityIndex entity, const char *sequence, EntityDirection direction) const; |