ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASYLUM: Rename arrays holding the distances for each actor frame index

Browse Source
This commit is contained in:
Julien Templier
2021-05-17 15:36:59 +02:00
committed by Eugene Sandulenko
parent cae5eaa927
commit 6b20fdb4e4
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/asylum/resources/actor.cpp
+15 -13
View File
@@ -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];
}
}
engines/asylum/resources/actor.h
+3 -3
View File
@@ -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;