aboutsummaryrefslogtreecommitdiff
path: root/engines/hopkins/lines.cpp
diff options
context:
space:
mode:
authorStrangerke2013-02-19 23:18:43 +0100
committerStrangerke2013-02-19 23:18:43 +0100
commit9aa7e136f85073b16542f67d5b1fd696eff77fa6 (patch)
treea913bb25fc2e1aebe794ee464956949002184b07 /engines/hopkins/lines.cpp
parent213914c04538ce636007a1cd895f56ee56db3aca (diff)
downloadscummvm-rg350-9aa7e136f85073b16542f67d5b1fd696eff77fa6.tar.gz
scummvm-rg350-9aa7e136f85073b16542f67d5b1fd696eff77fa6.tar.bz2
scummvm-rg350-9aa7e136f85073b16542f67d5b1fd696eff77fa6.zip
HOPKINS: Some more renaming in TalkManager and Globals
Diffstat (limited to 'engines/hopkins/lines.cpp')
-rw-r--r--engines/hopkins/lines.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/hopkins/lines.cpp b/engines/hopkins/lines.cpp
index f63b4a2adc..912980ce69 100644
--- a/engines/hopkins/lines.cpp
+++ b/engines/hopkins/lines.cpp
@@ -2261,8 +2261,8 @@ bool LinesManager::makeSmoothMove(int fromX, int fromY, int destX, int destY) {
int smoothIdx = 0;
int stepCount = 0;
while (curX > destX && destY > curY) {
- int v25 = _vm->_globals.Hopkins[hopkinsIdx].field0;
- int v40 = _vm->_globals.Hopkins[hopkinsIdx].field2;
+ int v25 = _vm->_globals._hopkinsItem[hopkinsIdx]._speedX;
+ int v40 = _vm->_globals._hopkinsItem[hopkinsIdx]._speedY;
int spriteSize = _vm->_globals._spriteSize[curY];
if (spriteSize < 0) {
v25 = _vm->_graphicsManager.zoomOut(v25, -spriteSize);
@@ -2295,8 +2295,8 @@ bool LinesManager::makeSmoothMove(int fromX, int fromY, int destX, int destY) {
int smoothIdx = 0;
int stepCount = 0;
while (curX < destX && destY > curY) {
- int v14 = _vm->_globals.Hopkins[hopkinsIdx].field0;
- int v39 = _vm->_globals.Hopkins[hopkinsIdx].field2;
+ int v14 = _vm->_globals._hopkinsItem[hopkinsIdx]._speedX;
+ int v39 = _vm->_globals._hopkinsItem[hopkinsIdx]._speedY;
int spriteSize = _vm->_globals._spriteSize[curY];
if (spriteSize < 0) {
v14 = _vm->_graphicsManager.zoomOut(v14, -spriteSize);
@@ -2329,8 +2329,8 @@ bool LinesManager::makeSmoothMove(int fromX, int fromY, int destX, int destY) {
int smoothIdx = 0;
int stepCount = 0;
while (curX > destX && destY < curY) {
- int v11 = _vm->_graphicsManager.zoomOut(_vm->_globals.Hopkins[hopkinsIdx].field0, 25);
- int v38 = _vm->_graphicsManager.zoomOut(_vm->_globals.Hopkins[hopkinsIdx].field2, 25);
+ int v11 = _vm->_graphicsManager.zoomOut(_vm->_globals._hopkinsItem[hopkinsIdx]._speedX, 25);
+ int v38 = _vm->_graphicsManager.zoomOut(_vm->_globals._hopkinsItem[hopkinsIdx]._speedY, 25);
int oldY = curY;
for (int v12 = 0; v12 < v11; v12++) {
--curX;
@@ -2357,8 +2357,8 @@ bool LinesManager::makeSmoothMove(int fromX, int fromY, int destX, int destY) {
int stepCount = 0;
while (curX < destX && destY < curY) {
int oldY = curY;
- int v7 = _vm->_graphicsManager.zoomOut(_vm->_globals.Hopkins[hopkinsIdx].field0, 25);
- int v37 = _vm->_graphicsManager.zoomOut(_vm->_globals.Hopkins[hopkinsIdx].field2, 25);
+ int v7 = _vm->_graphicsManager.zoomOut(_vm->_globals._hopkinsItem[hopkinsIdx]._speedX, 25);
+ int v37 = _vm->_graphicsManager.zoomOut(_vm->_globals._hopkinsItem[hopkinsIdx]._speedY, 25);
for (int i = 0; i < v7; i++) {
++curX;
_smoothRoute[smoothIdx]._posX = curX;