A few var renames.

svn-id: r16837

3 files changed, 191 insertions, 191 deletions

diff --git a/scumm/intern.h b/scumm/intern.h
index 2c1399f59f..181517b7c0 100644
--- a/scumm/intern.h
+++ b/scumm/intern.h
@@ -874,34 +874,34 @@ protected:
 	uint8 getWizPixelColor(int restype, int resnum, int state, int x, int y, int flags);
 	int computeWizHistogram(int resnum, int state, int x, int y, int w, int h);
 	
-	int spriteInfoGet_flags_1(int spriteNum);
-	int spriteInfoGet_flags_2(int spriteNum);
-	int spriteInfoGet_flags_3(int spriteNum);
-	int spriteInfoGet_flags_4(int spriteNum);
-	int spriteInfoGet_flags_5(int spriteNum);
-	int spriteInfoGet_flags_6(int spriteNum);
-	int spriteInfoGet_flags_7(int spriteNum);	
-	int spriteInfoGet_flags_8(int spriteNum);
-	int spriteInfoGet_resId(int spriteNun);
-	int spriteInfoGet_resState(int spriteNun);
-	int spriteInfoGet_groupNum(int spriteNun);
-	int spriteInfoGet_field_18(int spriteNun);
-	int spriteInfoGet_grp_tx(int spriteNun);
-	int spriteInfoGet_grp_ty(int spriteNun);
-	int spriteInfoGet_field_44(int spriteNun);
-	int spriteInfoGet_field_54(int spriteNun);
-	int spriteInfoGet_wizSize(int spriteNun);
-	int spriteInfoGet_zoom(int spriteNun);
-	int spriteInfoGet_field_78(int spriteNun);
-	int spriteInfoGet_field_80(int spriteNun);
-	void getSpriteImageDim(int spriteNum, int32 &w, int32 &h);
-	void spriteInfoGet_tx_ty(int spriteNum, int32 &tx, int32 &ty);
-	void spriteInfoGet_field_2C_30(int spriteNum, int32 &field_2C, int32 &field_30);
-
-	void spriteInfoSet_field_14(int spriteNum, int value);
-	void spriteInfoSet_field_7C(int spriteNum, int value);
-	void spriteInfoSet_field_80(int spriteNum, int value);
-	void spriteInfoSet_case183(int spriteNum);
+	int spriteInfoGet_flags_1(int spriteId);
+	int spriteInfoGet_flags_2(int spriteId);
+	int spriteInfoGet_flags_3(int spriteId);
+	int spriteInfoGet_flags_4(int spriteId);
+	int spriteInfoGet_flags_5(int spriteId);
+	int spriteInfoGet_flags_6(int spriteId);
+	int spriteInfoGet_flags_7(int spriteId);	
+	int spriteInfoGet_flags_8(int spriteId);
+	int spriteInfoGet_resId(int spriteId);
+	int spriteInfoGet_resState(int spriteId);
+	int spriteInfoGet_groupNum(int spriteId);
+	int spriteInfoGet_field_18(int spriteId);
+	int spriteInfoGet_grp_tx(int spriteId);
+	int spriteInfoGet_grp_ty(int spriteId);
+	int spriteInfoGet_field_44(int spriteId);
+	int spriteInfoGet_field_54(int spriteId);
+	int spriteInfoGet_wizSize(int spriteId);
+	int spriteInfoGet_zoom(int spriteId);
+	int spriteInfoGet_field_78(int spriteId);
+	int spriteInfoGet_field_80(int spriteId);
+	void getSpriteImageDim(int spriteId, int32 &w, int32 &h);
+	void spriteInfoGet_tx_ty(int spriteId, int32 &tx, int32 &ty);
+	void spriteInfoGet_field_2C_30(int spriteId, int32 &field_2C, int32 &field_30);
+
+	void spriteInfoSet_field_14(int spriteId, int value);
+	void spriteInfoSet_field_7C(int spriteId, int value);
+	void spriteInfoSet_field_80(int spriteId, int value);
+	void spriteInfoSet_case183(int spriteId);
 
 	void spritesAllocTables(int numSprites, int numGroups, int numImgSprites);
 	void spritesResetTables(bool refreshScreen);
diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp
index 64aec9e826..6b3c515588 100644
--- a/scumm/script_v90he.cpp
+++ b/scumm/script_v90he.cpp
@@ -698,7 +698,7 @@ void ScummEngine_v90he::o90_getDistanceBetweenPoints() {
 
 void ScummEngine_v90he::o90_getSpriteInfo() {
 	int args[16];
-	int eax, esi;
+	int spriteId, flags;
 	int32 a, b;
 	byte subOp = fetchScriptByte();
 	subOp -= 30;
@@ -706,104 +706,104 @@ void ScummEngine_v90he::o90_getSpriteInfo() {
 	debug(1,"o90_getSpriteInfo stub (%d)", subOp);
 	switch (subOp) {
 	case 0:
-		eax = pop();
-		if (eax) {
-			spriteInfoGet_tx_ty(eax, a, b);
+		spriteId = pop();
+		if (spriteId) {
+			spriteInfoGet_tx_ty(spriteId, a, b);
 			push(a);
 		} else {
 			push(0);
 		}
 	case 1:
-		eax = pop();
-		if (eax) {
-			spriteInfoGet_tx_ty(eax, a, b);
+		spriteId = pop();
+		if (spriteId) {
+			spriteInfoGet_tx_ty(spriteId, a, b);
 			push(b);
 		} else {
 			push(0);
 		}
 	case 2:
-		eax = pop();
-		if (eax) {
-			getSpriteImageDim(eax, a, b);
+		spriteId = pop();
+		if (spriteId) {
+			getSpriteImageDim(spriteId, a, b);
 			push(a);
 		} else {
 			push(0);
 		}
 		break;
 	case 3:
-		eax = pop();
-		if (eax) {
-			getSpriteImageDim(eax, a, b);
+		spriteId = pop();
+		if (spriteId) {
+			getSpriteImageDim(spriteId, a, b);
 			push(b);
 		} else {
 			push(0);
 		}
 		break;
 	case 4:
-		eax = pop();
-		if (eax) {
-			spriteInfoGet_field_2C_30(eax, a, b);
+		spriteId = pop();
+		if (spriteId) {
+			spriteInfoGet_field_2C_30(spriteId, a, b);
 			push(a);
 		} else {
 			push(0);
 		}
 		break;
 	case 5:
-		eax = pop();
-		if (eax) {
-			spriteInfoGet_field_2C_30(eax, a, b);
+		spriteId = pop();
+		if (spriteId) {
+			spriteInfoGet_field_2C_30(spriteId, a, b);
 			push(b);
 		} else {
 			push(0);
 		}
 		break;
 	case 6:
-		eax = pop();
-		if (eax)
-			push(spriteInfoGet_wizSize(eax));
+		spriteId = pop();
+		if (spriteId)
+			push(spriteInfoGet_wizSize(spriteId));
 		else
 			push(0);
 		break;
 	case 7:
-		eax = pop();
-		if (eax)
-			push(spriteInfoGet_groupNum(eax));
+		spriteId = pop();
+		if (spriteId)
+			push(spriteInfoGet_groupNum(spriteId));
 		else
 			push(0);
 		break;
 	case 8:
-		eax = pop();
-		if (eax)
-			push(spriteInfoGet_grp_tx(eax));
+		spriteId = pop();
+		if (spriteId)
+			push(spriteInfoGet_grp_tx(spriteId));
 		else
 			push(0);
 		break;
 	case 9:
-		eax = pop();
-		if (eax)
-			push(spriteInfoGet_grp_ty(eax));
+		spriteId = pop();
+		if (spriteId)
+			push(spriteInfoGet_grp_ty(spriteId));
 		else
 			push(0);
 		break;
 	case 12:
-		esi = pop();
-		eax = pop();
-		if (eax) {
-			switch(esi) {
+		flags = pop();
+		spriteId = pop();
+		if (spriteId) {
+			switch(flags) {
 			case 0:
-				push(spriteInfoGet_flags_1(eax));
+				push(spriteInfoGet_flags_1(spriteId));
 				break;
 			case 1:
-				push(spriteInfoGet_flags_2(eax));
+				push(spriteInfoGet_flags_2(spriteId));
 				break;
 			case 2:
-				push(spriteInfoGet_flags_3(eax));
+				push(spriteInfoGet_flags_3(spriteId));
 				break;
 			case 3:
-				push(spriteInfoGet_flags_4(eax));
+				push(spriteInfoGet_flags_4(spriteId));
 				break;
 			case 4:
-				push(spriteInfoGet_flags_5(eax));
+				push(spriteInfoGet_flags_5(spriteId));
 				break;
 			default:
 				push(0);
@@ -813,9 +813,9 @@ void ScummEngine_v90he::o90_getSpriteInfo() {
 		}
 		break;
 	case 13:
-		eax = pop();
-		if (eax)
-			push(spriteInfoGet_field_18(eax));
+		spriteId = pop();
+		if (spriteId)
+			push(spriteInfoGet_field_18(spriteId));
 		else
 			push(0);
 		break;
@@ -838,58 +838,58 @@ void ScummEngine_v90he::o90_getSpriteInfo() {
 		}
 		break;
 	case 22:
-		eax = pop();
-		if (eax)
-			push(spriteInfoGet_resState(eax));
+		spriteId = pop();
+		if (spriteId)
+			push(spriteInfoGet_resState(spriteId));
 		else
 			push(0);
 		break;
 	case 33:
-		eax = pop();
-		if (eax)
-			push(spriteInfoGet_resId(eax));
+		spriteId = pop();
+		if (spriteId)
+			push(spriteInfoGet_resId(spriteId));
 		else
 			push(0);
 		break;
 	case 38:
-		eax = pop();
-		if (eax)
-			push(spriteInfoGet_flags_8(eax));
+		spriteId = pop();
+		if (spriteId)
+			push(spriteInfoGet_flags_8(spriteId));
 		else
 			push(1);
 		break;
 	case 52:
-		eax = pop();
-		if (eax)
-			push(spriteInfoGet_flags_6(eax));
+		spriteId = pop();
+		if (spriteId)
+			push(spriteInfoGet_flags_6(spriteId));
 		else
 			push(0);
 		break;
 	case 62:
-		eax = pop();
-		if (eax)
-			push(spriteInfoGet_zoom(eax));
+		spriteId = pop();
+		if (spriteId)
+			push(spriteInfoGet_zoom(spriteId));
 		else
 			push(0);
 		break;
 	case 67:
-		eax = pop();
-		if (eax)
-			push(spriteInfoGet_field_78(eax));
+		spriteId = pop();
+		if (spriteId)
+			push(spriteInfoGet_field_78(spriteId));
 		else
 			push(0);
 		break;
 	case 68:
-		eax = pop();
-		if (eax)
-			push(spriteInfoGet_field_54(eax));
+		spriteId = pop();
+		if (spriteId)
+			push(spriteInfoGet_field_54(spriteId));
 		else
 			push(0);
 		break;
 	case 94:
-		eax = pop();
-		if (eax)
-			push(spriteInfoGet_flags_7(eax));
+		spriteId = pop();
+		if (spriteId)
+			push(spriteInfoGet_flags_7(spriteId));
 		else
 			push(0);
 		break;
@@ -903,17 +903,17 @@ void ScummEngine_v90he::o90_getSpriteInfo() {
 		push(0);
 		break;
 	case 110:
-		eax = pop();
-		if (eax)
-			push(spriteInfoGet_field_80(eax));
+		spriteId = pop();
+		if (spriteId)
+			push(spriteInfoGet_field_80(spriteId));
 		else
 			push(0);
 		break;
 	case 168:
 		pop();
-		eax = pop();
-		if (eax)
-			push(spriteInfoGet_field_44(eax));
+		spriteId = pop();
+		if (spriteId)
+			push(spriteInfoGet_field_44(spriteId));
 		else
 			push(0);
 		break;
diff --git a/scumm/sprite_he.cpp b/scumm/sprite_he.cpp
index 6434178e6b..c7b8bee9ac 100644
--- a/scumm/sprite_he.cpp
+++ b/scumm/sprite_he.cpp
@@ -35,181 +35,181 @@ void ScummEngine_v90he::allocateArrays() {
 	spritesAllocTables(_numSprites, 64, 64);
 }
 
-int ScummEngine_v90he::spriteInfoGet_flags_1(int spriteNum) {
-	checkRange(_numSprites, 1, spriteNum, "_spriteTableGet_flags_1: Invalid sprite %d");
+int ScummEngine_v90he::spriteInfoGet_flags_1(int spriteId) {
+	checkRange(_numSprites, 1, spriteId, "_spriteTableGet_flags_1: Invalid sprite %d");
 
-	return ((_spriteTable[spriteNum].flags & kSF15) != 0) ? 1 : 0;
+	return ((_spriteTable[spriteId].flags & kSF15) != 0) ? 1 : 0;
 }
 
-int ScummEngine_v90he::spriteInfoGet_flags_2(int spriteNum) {
-	checkRange(_numSprites, 1, spriteNum, "_spriteTableGet_flags_2: Invalid sprite %d");
+int ScummEngine_v90he::spriteInfoGet_flags_2(int spriteId) {
+	checkRange(_numSprites, 1, spriteId, "_spriteTableGet_flags_2: Invalid sprite %d");
 
-	return ((_spriteTable[spriteNum].flags & kSF14) != 0) ? 1 : 0;
+	return ((_spriteTable[spriteId].flags & kSF14) != 0) ? 1 : 0;
 }
 
-int ScummEngine_v90he::spriteInfoGet_flags_3(int spriteNum) {
-	checkRange(_numSprites, 1, spriteNum, "_spriteTableGet_flags_3: Invalid sprite %d");
+int ScummEngine_v90he::spriteInfoGet_flags_3(int spriteId) {
+	checkRange(_numSprites, 1, spriteId, "_spriteTableGet_flags_3: Invalid sprite %d");
 
-	return ((_spriteTable[spriteNum].flags & kSF16) != 0) ? 1 : 0;
+	return ((_spriteTable[spriteId].flags & kSF16) != 0) ? 1 : 0;
 }
 
-int ScummEngine_v90he::spriteInfoGet_flags_4(int spriteNum) {
-	checkRange(_numSprites, 1, spriteNum, "_spriteTableGet_flags_4: Invalid sprite %d");
+int ScummEngine_v90he::spriteInfoGet_flags_4(int spriteId) {
+	checkRange(_numSprites, 1, spriteId, "_spriteTableGet_flags_4: Invalid sprite %d");
 
-	return ((_spriteTable[spriteNum].flags & kSF13) != 0) ? 1 : 0;
+	return ((_spriteTable[spriteId].flags & kSF13) != 0) ? 1 : 0;
 }
 
-int ScummEngine_v90he::spriteInfoGet_flags_5(int spriteNum) {
-	checkRange(_numSprites, 1, spriteNum, "_spriteTableGet_flags_5: Invalid sprite %d");
+int ScummEngine_v90he::spriteInfoGet_flags_5(int spriteId) {
+	checkRange(_numSprites, 1, spriteId, "_spriteTableGet_flags_5: Invalid sprite %d");
 
-	return ((_spriteTable[spriteNum].flags & kSF20) != 0) ? 1 : 0;
+	return ((_spriteTable[spriteId].flags & kSF20) != 0) ? 1 : 0;
 }
 
-int ScummEngine_v90he::spriteInfoGet_flags_6(int spriteNum) {
-	checkRange(_numSprites, 1, spriteNum, "_spriteTableGet_flags_6: Invalid sprite %d");
+int ScummEngine_v90he::spriteInfoGet_flags_6(int spriteId) {
+	checkRange(_numSprites, 1, spriteId, "_spriteTableGet_flags_6: Invalid sprite %d");
 
-	return _spriteTable[spriteNum].flags & kSF22;
+	return _spriteTable[spriteId].flags & kSF22;
 }
 
-int ScummEngine_v90he::spriteInfoGet_flags_7(int spriteNum) {
-	checkRange(_numSprites, 1, spriteNum, "_spriteTableGet_flags_7: Invalid sprite %d");
+int ScummEngine_v90he::spriteInfoGet_flags_7(int spriteId) {
+	checkRange(_numSprites, 1, spriteId, "_spriteTableGet_flags_7: Invalid sprite %d");
 
-	return ((_spriteTable[spriteNum].flags & kSF23) != 0) ? 1 : 0;
+	return ((_spriteTable[spriteId].flags & kSF23) != 0) ? 1 : 0;
 }
 
-int ScummEngine_v90he::spriteInfoGet_flags_8(int spriteNum) {
-	checkRange(_numSprites, 1, spriteNum, "_spriteTableGet_flags_8: Invalid sprite %d");
+int ScummEngine_v90he::spriteInfoGet_flags_8(int spriteId) {
+	checkRange(_numSprites, 1, spriteId, "_spriteTableGet_flags_8: Invalid sprite %d");
 
-	return ((_spriteTable[spriteNum].flags & kSF31) != 0) ? 1 : 0;
+	return ((_spriteTable[spriteId].flags & kSF31) != 0) ? 1 : 0;
 }
 
-int ScummEngine_v90he::spriteInfoGet_resId(int spriteNum) {
-	checkRange(_numSprites, 1, spriteNum, "spriteInfoGet_resId: Invalid sprite %d");
+int ScummEngine_v90he::spriteInfoGet_resId(int spriteId) {
+	checkRange(_numSprites, 1, spriteId, "spriteInfoGet_resId: Invalid sprite %d");
 
-	return _spriteTable[spriteNum].res_id;
+	return _spriteTable[spriteId].res_id;
 }
 
-int ScummEngine_v90he::spriteInfoGet_resState(int spriteNum) {
-	checkRange(_numSprites, 1, spriteNum, "spriteInfoGet_resState: Invalid sprite %d");
+int ScummEngine_v90he::spriteInfoGet_resState(int spriteId) {
+	checkRange(_numSprites, 1, spriteId, "spriteInfoGet_resState: Invalid sprite %d");
 
-	return _spriteTable[spriteNum].res_state;
+	return _spriteTable[spriteId].res_state;
 }
 
-int ScummEngine_v90he::spriteInfoGet_groupNum(int spriteNum) {
-	checkRange(_numSprites, 1, spriteNum, "spriteInfoGet_groupNum: Invalid sprite %d");
+int ScummEngine_v90he::spriteInfoGet_groupNum(int spriteId) {
+	checkRange(_numSprites, 1, spriteId, "spriteInfoGet_groupNum: Invalid sprite %d");
 
-	return _spriteTable[spriteNum].group_num;
+	return _spriteTable[spriteId].group_num;
 }
 
-int ScummEngine_v90he::spriteInfoGet_field_18(int spriteNum) {
-	checkRange(_numSprites, 1, spriteNum, "spriteInfoGet_field_18: Invalid sprite %d");
+int ScummEngine_v90he::spriteInfoGet_field_18(int spriteId) {
+	checkRange(_numSprites, 1, spriteId, "spriteInfoGet_field_18: Invalid sprite %d");
 
-	return _spriteTable[spriteNum].field_18;
+	return _spriteTable[spriteId].field_18;
 }
 
-int ScummEngine_v90he::spriteInfoGet_grp_tx(int spriteNum) {
-	checkRange(_numSprites, 1, spriteNum, "spriteInfoGet_grp_tx: Invalid sprite %d");
+int ScummEngine_v90he::spriteInfoGet_grp_tx(int spriteId) {
+	checkRange(_numSprites, 1, spriteId, "spriteInfoGet_grp_tx: Invalid sprite %d");
 
-	if (_spriteTable[spriteNum].group_num)
-		return _spriteTable[spriteNum].tx + _spriteGroups[spriteNum].tx;
+	if (_spriteTable[spriteId].group_num)
+		return _spriteTable[spriteId].tx + _spriteGroups[spriteId].tx;
 	else
-		return _spriteTable[spriteNum].tx;
+		return _spriteTable[spriteId].tx;
 }
 
-int ScummEngine_v90he::spriteInfoGet_grp_ty(int spriteNum) {
-	checkRange(_numSprites, 1, spriteNum, "spriteInfoGet_grp_ty: Invalid sprite %d");
+int ScummEngine_v90he::spriteInfoGet_grp_ty(int spriteId) {
+	checkRange(_numSprites, 1, spriteId, "spriteInfoGet_grp_ty: Invalid sprite %d");
 
-	if (_spriteTable[spriteNum].group_num)
-		return _spriteTable[spriteNum].ty + _spriteGroups[spriteNum].ty;
+	if (_spriteTable[spriteId].group_num)
+		return _spriteTable[spriteId].ty + _spriteGroups[spriteId].ty;
 	else
-		return _spriteTable[spriteNum].ty;
+		return _spriteTable[spriteId].ty;
 }
 
-int ScummEngine_v90he::spriteInfoGet_field_44(int spriteNum) {
-	checkRange(_numSprites, 1, spriteNum, "spriteInfoGet_field_44: Invalid sprite %d");
+int ScummEngine_v90he::spriteInfoGet_field_44(int spriteId) {
+	checkRange(_numSprites, 1, spriteId, "spriteInfoGet_field_44: Invalid sprite %d");
 
-	return _spriteTable[spriteNum].field_44;
+	return _spriteTable[spriteId].field_44;
 }
 
-int ScummEngine_v90he::spriteInfoGet_field_54(int spriteNum) {
-	checkRange(_numSprites, 1, spriteNum, "spriteInfoGet_field_54: Invalid sprite %d");
+int ScummEngine_v90he::spriteInfoGet_field_54(int spriteId) {
+	checkRange(_numSprites, 1, spriteId, "spriteInfoGet_field_54: Invalid sprite %d");
 
-	return _spriteTable[spriteNum].field_54;
+	return _spriteTable[spriteId].field_54;
 }
 
-int ScummEngine_v90he::spriteInfoGet_wizSize(int spriteNum) {
-	checkRange(_numSprites, 1, spriteNum, "spriteInfoGet_wizSize: Invalid sprite %d");
+int ScummEngine_v90he::spriteInfoGet_wizSize(int spriteId) {
+	checkRange(_numSprites, 1, spriteId, "spriteInfoGet_wizSize: Invalid sprite %d");
 
-	return _spriteTable[spriteNum].res_wiz_states;
+	return _spriteTable[spriteId].res_wiz_states;
 }
 
-int ScummEngine_v90he::spriteInfoGet_zoom(int spriteNum) {
-	checkRange(_numSprites, 1, spriteNum, "spriteInfoGet_zoom: Invalid sprite %d");
+int ScummEngine_v90he::spriteInfoGet_zoom(int spriteId) {
+	checkRange(_numSprites, 1, spriteId, "spriteInfoGet_zoom: Invalid sprite %d");
 
-	return _spriteTable[spriteNum].zoom;
+	return _spriteTable[spriteId].zoom;
 }
 
-int ScummEngine_v90he::spriteInfoGet_field_78(int spriteNum) {
-	checkRange(_numSprites, 1, spriteNum, "spriteInfoGet_field_78: Invalid sprite %d");
+int ScummEngine_v90he::spriteInfoGet_field_78(int spriteId) {
+	checkRange(_numSprites, 1, spriteId, "spriteInfoGet_field_78: Invalid sprite %d");
 
-	return _spriteTable[spriteNum].field_78;
+	return _spriteTable[spriteId].field_78;
 }
 
-int ScummEngine_v90he::spriteInfoGet_field_80(int spriteNum) {
-	checkRange(_numSprites, 1, spriteNum, "spriteInfoGet_field_80: Invalid sprite %d");
+int ScummEngine_v90he::spriteInfoGet_field_80(int spriteId) {
+	checkRange(_numSprites, 1, spriteId, "spriteInfoGet_field_80: Invalid sprite %d");
 
-	return _spriteTable[spriteNum].field_80;
+	return _spriteTable[spriteId].field_80;
 }
 
-void ScummEngine_v90he::getSpriteImageDim(int spriteNum, int32 &w, int32 &h) {
-	checkRange(_numSprites, 1, spriteNum, "getSpriteImageDim: Invalid sprite %d");
+void ScummEngine_v90he::getSpriteImageDim(int spriteId, int32 &w, int32 &h) {
+	checkRange(_numSprites, 1, spriteId, "getSpriteImageDim: Invalid sprite %d");
 
-	getWizImageDim(_spriteTable[spriteNum].res_id, _spriteTable[spriteNum].res_state, w, h);
+	getWizImageDim(_spriteTable[spriteId].res_id, _spriteTable[spriteId].res_state, w, h);
 }
 
-void ScummEngine_v90he::spriteInfoGet_tx_ty(int spriteNum, int32 &tx, int32 &ty) {
-	checkRange(_numSprites, 1, spriteNum, "spriteInfoGet_tx_ty: Invalid sprite %d");
+void ScummEngine_v90he::spriteInfoGet_tx_ty(int spriteId, int32 &tx, int32 &ty) {
+	checkRange(_numSprites, 1, spriteId, "spriteInfoGet_tx_ty: Invalid sprite %d");
 
-	tx = _spriteTable[spriteNum].tx;
-	ty = _spriteTable[spriteNum].ty;
+	tx = _spriteTable[spriteId].tx;
+	ty = _spriteTable[spriteId].ty;
 }
 
-void ScummEngine_v90he::spriteInfoGet_field_2C_30(int spriteNum, int32 &field_2C, int32 &field_30) {
-	checkRange(_numSprites, 1, spriteNum, "spriteInfoGet_field_2C_30: Invalid sprite %d");
+void ScummEngine_v90he::spriteInfoGet_field_2C_30(int spriteId, int32 &field_2C, int32 &field_30) {
+	checkRange(_numSprites, 1, spriteId, "spriteInfoGet_field_2C_30: Invalid sprite %d");
 
-	field_2C = _spriteTable[spriteNum].field_2C;
-	field_30 = _spriteTable[spriteNum].field_30;
+	field_2C = _spriteTable[spriteId].field_2C;
+	field_30 = _spriteTable[spriteId].field_30;
 }
 
 //
 // spriteInfoSet functions
 //
-void ScummEngine_v90he::spriteInfoSet_field_14(int spriteNum, int value) {
-	checkRange(_varNumSprites, 1, spriteNum, "Invalid sprite %d");
+void ScummEngine_v90he::spriteInfoSet_field_14(int spriteId, int value) {
+	checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
 
-	if (_spriteTable[spriteNum].field_14 != value) {
-		_spriteTable[spriteNum].field_14 = value;
-		_spriteTable[spriteNum].flags |= kSF01 | kSF02;
+	if (_spriteTable[spriteId].field_14 != value) {
+		_spriteTable[spriteId].field_14 = value;
+		_spriteTable[spriteId].flags |= kSF01 | kSF02;
 	}
 }
 
-void ScummEngine_v90he::spriteInfoSet_field_7C(int spriteNum, int value) {
-	checkRange(_varNumSprites, 1, spriteNum, "Invalid sprite %d");
+void ScummEngine_v90he::spriteInfoSet_field_7C(int spriteId, int value) {
+	checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
 
-	if (_spriteTable[spriteNum].field_7C != value) {
-		_spriteTable[spriteNum].field_7C = value;
-		_spriteTable[spriteNum].flags |= kSF01 | kSF02;
+	if (_spriteTable[spriteId].field_7C != value) {
+		_spriteTable[spriteId].field_7C = value;
+		_spriteTable[spriteId].flags |= kSF01 | kSF02;
 	}
 }
 
-void ScummEngine_v90he::spriteInfoSet_field_80(int spriteNum, int value) {
-	checkRange(_varNumSprites, 1, spriteNum, "Invalid sprite %d");
+void ScummEngine_v90he::spriteInfoSet_field_80(int spriteId, int value) {
+	checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
 
-	_spriteTable[spriteNum].field_80 = value;
+	_spriteTable[spriteId].field_80 = value;
 }
 
-void ScummEngine_v90he::spriteInfoSet_case183(int spriteNum) {
-	checkRange(_varNumSprites, 1, spriteNum, "Invalid sprite %d");
+void ScummEngine_v90he::spriteInfoSet_case183(int spriteId) {
+	checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
 
 	// TODO
 }