From 6b20fdb4e4eb331ba85e76f75beb2d69e921334b Mon Sep 17 00:00:00 2001
From: Julien Templier <littleboy@scummvm.org>
Date: Thu, 14 Jul 2011 08:57:57 -0400
Subject: [PATCH] ASYLUM: Rename arrays holding the distances for each actor
 frame index

---
 engines/asylum/resources/actor.cpp | 28 +++++++++++++++-------------
 engines/asylum/resources/actor.h   |  6 +++---
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/engines/asylum/resources/actor.cpp b/engines/asylum/resources/actor.cpp
index 618e255eaaa..fe70182c851 100644
--- a/engines/asylum/resources/actor.cpp
+++ b/engines/asylum/resources/actor.cpp
@@ -75,9 +75,9 @@ Actor::Actor(AsylumEngine *engine, ActorIndex index) : _vm(engine), _index(index
  	_field_650 = 0;
  	memset(_graphicResourceIds, 0 , sizeof(_graphicResourceIds));
  	memset(&_name, 0, sizeof(_name));
- 	memset(&_field_830, 0, sizeof(_field_830));
- 	memset(&_field_880, 0, sizeof(_field_880));
- 	memset(&_field_8D0, 0, sizeof(_field_8D0));
+ 	memset(&_distancesEO, 0, sizeof(_distancesEO));
+ 	memset(&_distancesNS, 0, sizeof(_distancesNS));
+ 	memset(&_distancesNSEO, 0, sizeof(_distancesNSEO));
  	_actionIdx2 = 0;
  	_field_924 = 0;
  	_lastScreenUpdate = 0;
@@ -182,13 +182,13 @@ void Actor::load(Common::SeekableReadStream *stream) {
 	stream->read(_name, sizeof(_name));
 
 	for (int32 i = 0; i < 20; i++)
-		_field_830[i] = stream->readSint32LE();
+		_distancesEO[i] = stream->readSint32LE();
 
 	for (int32 i = 0; i < 20; i++)
-		_field_880[i] = stream->readSint32LE();
+		_distancesNS[i] = stream->readSint32LE();
 
 	for (int32 i = 0; i < 20; i++)
-		_field_8D0[i] = stream->readSint32LE();
+		_distancesNSEO[i] = stream->readSint32LE();
 
 	_actionIdx2 = stream->readSint32LE();
 	_field_924  = stream->readSint32LE();
@@ -2772,36 +2772,38 @@ int32 Actor::getDistance() const {
 
 	case kDirectionNO:
 	case kDirectionSO:
-		return -_field_8D0[index];
+		return -_distancesNSEO[index];
 
 	case kDirectionO:
-		return -_field_830[index];
+		return -_distancesEO[index];
 
 	case kDirectionSE:
 	case kDirectionNE:
-		return _field_8D0[index];
+		return _distancesNSEO[index];
 
 	case kDirectionE:
-		return _field_830[index];
+		return _distancesEO[index];
 	}
 }
 
 int32 Actor::getDistanceForFrame(ActorDirection dir, uint32 frameIndex) {
 	switch (dir) {
 	default:
+		error("[Actor::getDistanceForFrame] Invalid direction");
+
 	case kDirectionN:
 	case kDirectionS:
-		return _field_880[frameIndex];
+		return _distancesNS[frameIndex];
 
 	case kDirectionNO:
 	case kDirectionSO:
 	case kDirectionSE:
 	case kDirectionNE:
-		return _field_8D0[frameIndex];
+		return _distancesNSEO[frameIndex];
 
 	case kDirectionO:
 	case kDirectionE:
-		return _field_830[frameIndex];
+		return _distancesEO[frameIndex];
 	}
 }
 
diff --git a/engines/asylum/resources/actor.h b/engines/asylum/resources/actor.h
index 47f4da6e472..9efa6e352d5 100644
--- a/engines/asylum/resources/actor.h
+++ b/engines/asylum/resources/actor.h
@@ -347,9 +347,9 @@ private:
 	uint32  _field_650;
 	ResourceId  _graphicResourceIds[55];
 	char   _name[256];
-	int32  _field_830[20];
-	int32  _field_880[20];
-	int32  _field_8D0[20];
+	int32  _distancesEO[20];
+	int32  _distancesNS[20];
+	int32  _distancesNSEO[20];
 	int32  _actionIdx2;
 	int32  _field_924;
 	uint32 _lastScreenUpdate;