[Scummvm-cvs-logs] SF.net SVN: scummvm:[53689] scummvm/trunk/engines/lastexpress/entities

[littleboy at users.sourceforge.net]

Revision: 53689
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53689&view=rev
Author:   littleboy
Date:     2010-10-21 23:43:57 +0000 (Thu, 21 Oct 2010)

Log Message:
-----------
LASTEXPRESS: Rename LOBYTE macro

Modified Paths:
--------------
    scummvm/trunk/engines/lastexpress/entities/alexei.cpp
    scummvm/trunk/engines/lastexpress/entities/anna.cpp
    scummvm/trunk/engines/lastexpress/entities/august.cpp
    scummvm/trunk/engines/lastexpress/entities/entity_intern.h

Modified: scummvm/trunk/engines/lastexpress/entities/alexei.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/alexei.cpp	2010-10-21 23:43:36 UTC (rev 53688)
+++ scummvm/trunk/engines/lastexpress/entities/alexei.cpp	2010-10-21 23:43:57 UTC (rev 53689)
@@ -545,7 +545,7 @@
 		break;
 
 	case kAction168627977:
-		getData()->inventoryItem = (InventoryItem)LOBYTE(params->param2);
+		getData()->inventoryItem = (InventoryItem)LOW_BYTE(params->param2);
 		break;
 
 	case kAction225182640:

Modified: scummvm/trunk/engines/lastexpress/entities/anna.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/anna.cpp	2010-10-21 23:43:36 UTC (rev 53688)
+++ scummvm/trunk/engines/lastexpress/entities/anna.cpp	2010-10-21 23:43:57 UTC (rev 53689)
@@ -573,7 +573,7 @@
 		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 @@
 				params->param2 |= 8;
 		}
 
-		getData()->inventoryItem = (InventoryItem)LOBYTE(params->param2);
+		getData()->inventoryItem = (InventoryItem)LOW_BYTE(params->param2);
 		break;
 
 	case kActionDrawScene:
@@ -737,7 +737,7 @@
 				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 @@
 		break;
 
 	case kAction168627977:
-		getData()->inventoryItem = (InventoryItem)LOBYTE(params->param2);
+		getData()->inventoryItem = (InventoryItem)LOW_BYTE(params->param2);
 		params->param4 = 0;
 		break;
 

Modified: scummvm/trunk/engines/lastexpress/entities/august.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/august.cpp	2010-10-21 23:43:36 UTC (rev 53688)
+++ scummvm/trunk/engines/lastexpress/entities/august.cpp	2010-10-21 23:43:57 UTC (rev 53689)
@@ -1456,7 +1456,7 @@
 		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 @@
 		break;
 
 	case kAction168627977:
-		getData()->inventoryItem = (InventoryItem)LOBYTE(params->param1);
+		getData()->inventoryItem = (InventoryItem)LOW_BYTE(params->param1);
 		break;
 
 	case kAction189426612:

Modified: scummvm/trunk/engines/lastexpress/entities/entity_intern.h
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/entity_intern.h	2010-10-21 23:43:36 UTC (rev 53688)
+++ scummvm/trunk/engines/lastexpress/entities/entity_intern.h	2010-10-21 23:43:57 UTC (rev 53689)
@@ -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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.