diff options
| author | Julien Templier | 2010-10-21 23:43:57 +0000 |
|---|---|---|
| committer | Julien Templier | 2010-10-21 23:43:57 +0000 |
| commit | af36047c715e7bffaa36de2c0018dbf1cb88d284 (patch) | |
| tree | 849b4c528e99493427ee540795dd8da4ce7748b7 | |
| parent | 3abbcfd7802fc7a309a23940254d9a6e55dd2f82 (diff) | |
| download | scummvm-rg350-af36047c715e7bffaa36de2c0018dbf1cb88d284.tar.gz scummvm-rg350-af36047c715e7bffaa36de2c0018dbf1cb88d284.tar.bz2 scummvm-rg350-af36047c715e7bffaa36de2c0018dbf1cb88d284.zip | |
LASTEXPRESS: Rename LOBYTE macro
svn-id: r53689
| -rw-r--r-- | engines/lastexpress/entities/alexei.cpp | 2 | ||||
| -rw-r--r-- | engines/lastexpress/entities/anna.cpp | 8 | ||||
| -rw-r--r-- | engines/lastexpress/entities/august.cpp | 4 | ||||
| -rw-r--r-- | engines/lastexpress/entities/entity_intern.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/engines/lastexpress/entities/alexei.cpp b/engines/lastexpress/entities/alexei.cpp index dc6d5f0729..664eb18782 100644 --- a/engines/lastexpress/entities/alexei.cpp +++ b/engines/lastexpress/entities/alexei.cpp @@ -545,7 +545,7 @@ IMPLEMENT_FUNCTION(18, Alexei, chapter1Handler) break; case kAction168627977: - getData()->inventoryItem = (InventoryItem)LOBYTE(params->param2); + getData()->inventoryItem = (InventoryItem)LOW_BYTE(params->param2); break; case kAction225182640: diff --git a/engines/lastexpress/entities/anna.cpp b/engines/lastexpress/entities/anna.cpp index 14a7408ff3..33b1eec4cf 100644 --- a/engines/lastexpress/entities/anna.cpp +++ b/engines/lastexpress/entities/anna.cpp @@ -573,7 +573,7 @@ IMPLEMENT_FUNCTION_II(17, Anna, function17, uint32, uint32) break; case kActionNone: - getData()->inventoryItem = (params->param3 && getEntities()->isDistanceBetweenEntities(kEntityAnna, kEntityPlayer, 2000)) ? (InventoryItem)LOBYTE(params->param3) : kItemNone; + getData()->inventoryItem = (params->param3 && getEntities()->isDistanceBetweenEntities(kEntityAnna, kEntityPlayer, 2000)) ? (InventoryItem)LOW_BYTE(params->param3) : kItemNone; if (getEntities()->updateEntity(kEntityAnna, (CarIndex)params->param1, (EntityPosition)params->param2)) { getData()->inventoryItem = kItemNone; @@ -699,7 +699,7 @@ IMPLEMENT_FUNCTION_I(18, Anna, function18, TimeValue) params->param2 |= 8; } - getData()->inventoryItem = (InventoryItem)LOBYTE(params->param2); + getData()->inventoryItem = (InventoryItem)LOW_BYTE(params->param2); break; case kActionDrawScene: @@ -737,7 +737,7 @@ IMPLEMENT_FUNCTION_I(18, Anna, function18, TimeValue) params->param2 |= 8; } - getData()->inventoryItem = (InventoryItem)LOBYTE(params->param2); + getData()->inventoryItem = (InventoryItem)LOW_BYTE(params->param2); getScenes()->loadSceneFromPosition(kCarRestaurant, 61); break; } @@ -749,7 +749,7 @@ IMPLEMENT_FUNCTION_I(18, Anna, function18, TimeValue) break; case kAction168627977: - getData()->inventoryItem = (InventoryItem)LOBYTE(params->param2); + getData()->inventoryItem = (InventoryItem)LOW_BYTE(params->param2); params->param4 = 0; break; diff --git a/engines/lastexpress/entities/august.cpp b/engines/lastexpress/entities/august.cpp index 84a6eaa27b..c152d13c2a 100644 --- a/engines/lastexpress/entities/august.cpp +++ b/engines/lastexpress/entities/august.cpp @@ -1456,7 +1456,7 @@ IMPLEMENT_FUNCTION(29, August, function29) if (!getProgress().eventMetAugust && getProgress().jacket == kJacketGreen) params->param1 = kItemInvalid; - getData()->inventoryItem = (InventoryItem)LOBYTE(params->param1); + getData()->inventoryItem = (InventoryItem)LOW_BYTE(params->param1); getEntities()->drawSequenceLeft(kEntityAugust, "010H"); break; @@ -1466,7 +1466,7 @@ IMPLEMENT_FUNCTION(29, August, function29) break; case kAction168627977: - getData()->inventoryItem = (InventoryItem)LOBYTE(params->param1); + getData()->inventoryItem = (InventoryItem)LOW_BYTE(params->param1); break; case kAction189426612: diff --git a/engines/lastexpress/entities/entity_intern.h b/engines/lastexpress/entities/entity_intern.h index 8b0b158a6b..8243992b2e 100644 --- a/engines/lastexpress/entities/entity_intern.h +++ b/engines/lastexpress/entities/entity_intern.h @@ -28,7 +28,7 @@ namespace LastExpress { -#define LOBYTE(w) ((unsigned char)(((unsigned long)(w)) & 0xff)) +#define LOW_BYTE(w) ((unsigned char)(((unsigned long)(w)) & 0xff)) ////////////////////////////////////////////////////////////////////////// // Callbacks |