[Scummvm-git-logs] scummvm master -> 778781cb3ea2d0464d88be99e9a9376ae096e62b

[sev-]

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:
778781cb3e TWINE: Fix compilation on Amiga


Commit: 778781cb3ea2d0464d88be99e9a9376ae096e62b
    https://github.com/scummvm/scummvm/commit/778781cb3ea2d0464d88be99e9a9376ae096e62b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-10-24T20:02:00+02:00

Commit Message:
TWINE: Fix compilation on Amiga

Changed paths:
    engines/twine/animations.cpp
    engines/twine/hqrdepack.cpp


diff --git a/engines/twine/animations.cpp b/engines/twine/animations.cpp
index f7221223a0..3a01066e89 100644
--- a/engines/twine/animations.cpp
+++ b/engines/twine/animations.cpp
@@ -68,7 +68,7 @@ enum ActionType {
 Animations::Animations(TwinEEngine *engine) : _engine(engine) {
 }
 
-int Animations::setAnimAtKeyframe(int32 keyframeIdx, uint8 *animPtr, uint8 *bodyPtr, AnimTimerDataStruct *animTimerDataPtr) {
+int32 Animations::setAnimAtKeyframe(int32 keyframeIdx, uint8 *animPtr, uint8 *bodyPtr, AnimTimerDataStruct *animTimerDataPtr) {
 	int16 numOfKeyframeInAnim;
 	int16 numOfBonesInAnim;
 	uint8 *ptrToData;
diff --git a/engines/twine/hqrdepack.cpp b/engines/twine/hqrdepack.cpp
index bd2e2a9284..c9c3369c63 100644
--- a/engines/twine/hqrdepack.cpp
+++ b/engines/twine/hqrdepack.cpp
@@ -134,7 +134,7 @@ int32 HQRDepack::hqrGetEntry(uint8 *ptr, const char *filename, int32 index) {
 	return realSize;
 }
 
-int HQRDepack::hqrEntrySize(const char *filename, int32 index) {
+int32 HQRDepack::hqrEntrySize(const char *filename, int32 index) {
 	if (!filename) {
 		return 0;
 	}
@@ -163,7 +163,7 @@ int HQRDepack::hqrEntrySize(const char *filename, int32 index) {
 	return realSize;
 }
 
-int HQRDepack::hqrNumEntries(const char *filename) {
+int32 HQRDepack::hqrNumEntries(const char *filename) {
 	if (!filename) {
 		return 0;
 	}