[Scummvm-cvs-logs] scummvm master -> f719be3318b5f4deaaccabc04e2fc4dbd256521f
dreammaster
dreammaster at scummvm.org
Sun Mar 31 17:20:32 CEST 2013
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
f719be3318 HOPKINS: Renamed anonymous parameter in LinesManager
Commit: f719be3318b5f4deaaccabc04e2fc4dbd256521f
https://github.com/scummvm/scummvm/commit/f719be3318b5f4deaaccabc04e2fc4dbd256521f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-03-31T08:19:38-07:00
Commit Message:
HOPKINS: Renamed anonymous parameter in LinesManager
Changed paths:
engines/hopkins/lines.cpp
engines/hopkins/lines.h
diff --git a/engines/hopkins/lines.cpp b/engines/hopkins/lines.cpp
index 142b599..31f68d0 100644
--- a/engines/hopkins/lines.cpp
+++ b/engines/hopkins/lines.cpp
@@ -2425,7 +2425,7 @@ bool LinesManager::PLAN_TEST(int paramX, int paramY, int superRouteIdx, int para
}
// Test line
-int LinesManager::testLine(int paramX, int paramY, int *a3, int *foundLineIdx, int *foundDataIdx) {
+int LinesManager::testLine(int paramX, int paramY, int *testValue, int *foundLineIdx, int *foundDataIdx) {
int16 *lineData;
int lineDataEndIdx;
int collLineIdx;
@@ -2435,7 +2435,7 @@ int LinesManager::testLine(int paramX, int paramY, int *a3, int *foundLineIdx, i
lineData = _lineItem[idx]._lineData;
lineDataEndIdx = _lineItem[idx]._lineDataEndIdx;
if (lineData[0] == paramX && lineData[1] == paramY) {
- *a3 = 1;
+ *testValue = 1;
int posX = lineData[2 * (lineDataEndIdx - 1)];
int posY = lineData[2 * (lineDataEndIdx - 1) + 1];
if (_lineItem[idx]._directionRouteInc == DIR_DOWN || _lineItem[idx]._directionRouteInc == DIR_UP)
@@ -2449,7 +2449,7 @@ int LinesManager::testLine(int paramX, int paramY, int *a3, int *foundLineIdx, i
return idx;
}
if (lineData[2 * (lineDataEndIdx - 1)] == paramX && lineData[2 * (lineDataEndIdx - 1) + 1] == paramY) {
- *a3 = 2;
+ *testValue = 2;
int posX = lineData[0];
int posY = lineData[1];
if (_lineItem[idx]._directionRouteInc == DIR_DOWN || _lineItem[idx]._directionRouteInc == DIR_UP)
diff --git a/engines/hopkins/lines.h b/engines/hopkins/lines.h
index 656c029..9e397cc 100644
--- a/engines/hopkins/lines.h
+++ b/engines/hopkins/lines.h
@@ -149,7 +149,7 @@ private:
bool checkSmoothMove(int fromX, int fromY, int destX, int destY);
bool makeSmoothMove(int fromX, int fromY, int destX, int destY);
int characterRoute(int fromX, int fromY, int destX, int destY, int startLineIdx, int endLineIdx, int routeIdx);
- int testLine(int paramX, int paramY, int *a3, int *foundLineIdx, int *foundDataIdx);
+ int testLine(int paramX, int paramY, int *testValue, int *foundLineIdx, int *foundDataIdx);
void useRoute0(int idx, int curRouteIdx);
void useRoute1(int idx, int curRouteIdx);
void useRoute2(int idx, int curRouteIdx);
More information about the Scummvm-git-logs
mailing list