diff options
| author | Willem Jan Palenstijn | 2012-09-21 22:34:27 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2012-09-21 22:35:15 +0200 |
| commit | 23de05926279d4d77ce7fd0830a51b86dd5fde98 (patch) | |
| tree | 45d8d146587bf0545655cbabf5a438fe8dbda798 /engines | |
| parent | 42e395859f44f1082e392fd5db217750ffdcbbb9 (diff) | |
| download | scummvm-rg350-23de05926279d4d77ce7fd0830a51b86dd5fde98.tar.gz scummvm-rg350-23de05926279d4d77ce7fd0830a51b86dd5fde98.tar.bz2 scummvm-rg350-23de05926279d4d77ce7fd0830a51b86dd5fde98.zip | |
VIDEO: Make getCurFrame declaration consistent
The declaration used int32 while the definition used int.
This should fix building on AmigaOS4 (bug #3570577).
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/mohawk/video.cpp | 2 | ||||
| -rw-r--r-- | engines/mohawk/video.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/mohawk/video.cpp b/engines/mohawk/video.cpp index 0ed4f38b53..b1b99722d5 100644 --- a/engines/mohawk/video.cpp +++ b/engines/mohawk/video.cpp @@ -478,7 +478,7 @@ VideoHandle VideoManager::findVideoHandle(const Common::String &filename) { return NULL_VID_HANDLE; } -int32 VideoManager::getCurFrame(VideoHandle handle) { +int VideoManager::getCurFrame(VideoHandle handle) { assert(handle != NULL_VID_HANDLE); return _videoStreams[handle]->getCurFrame(); } diff --git a/engines/mohawk/video.h b/engines/mohawk/video.h index 9dddcde09b..6d2783936d 100644 --- a/engines/mohawk/video.h +++ b/engines/mohawk/video.h @@ -98,7 +98,7 @@ public: // Handle functions VideoHandle findVideoHandle(uint16 id); VideoHandle findVideoHandle(const Common::String &filename); - int32 getCurFrame(VideoHandle handle); + int getCurFrame(VideoHandle handle); uint32 getFrameCount(VideoHandle handle); uint32 getTime(VideoHandle handle); uint32 getDuration(VideoHandle videoHandle); |