[Scummvm-git-logs] scummvm master -> ceb5f67c05a883537cdf3c2895b6e636991b7c76
ccawley2011
ccawley2011 at gmail.com
Fri Jul 9 22:18:05 UTC 2021
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:
ceb5f67c05 N64: Fix compilation
Commit: ceb5f67c05a883537cdf3c2895b6e636991b7c76
https://github.com/scummvm/scummvm/commit/ceb5f67c05a883537cdf3c2895b6e636991b7c76
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-07-09T23:17:54+01:00
Commit Message:
N64: Fix compilation
Changed paths:
backends/fs/n64/romfsstream.cpp
backends/platform/n64/framfs_save_manager.cpp
backends/platform/n64/pakfs_save_manager.cpp
diff --git a/backends/fs/n64/romfsstream.cpp b/backends/fs/n64/romfsstream.cpp
index 8661f8e9ab..8d032dded3 100644
--- a/backends/fs/n64/romfsstream.cpp
+++ b/backends/fs/n64/romfsstream.cpp
@@ -45,20 +45,20 @@ bool RomfsStream::eos() const {
return romfs_eof((ROMFILE *)_handle) != 0;
}
-int32 RomfsStream::pos() const {
+int64 RomfsStream::pos() const {
return romfs_tell((ROMFILE *)_handle);
}
-int32 RomfsStream::size() const {
- int32 oldPos = romfs_tell((ROMFILE *)_handle);
+int64 RomfsStream::size() const {
+ int64 oldPos = romfs_tell((ROMFILE *)_handle);
romfs_seek((ROMFILE *)_handle, 0, SEEK_END);
- int32 length = romfs_tell((ROMFILE *)_handle);
+ int64 length = romfs_tell((ROMFILE *)_handle);
romfs_seek((ROMFILE *)_handle, oldPos, SEEK_SET);
return length;
}
-bool RomfsStream::seek(int32 offs, int whence) {
+bool RomfsStream::seek(int64 offs, int whence) {
return romfs_seek((ROMFILE *)_handle, offs, whence) >= 0;
}
diff --git a/backends/platform/n64/framfs_save_manager.cpp b/backends/platform/n64/framfs_save_manager.cpp
index de645223e9..7c56601398 100644
--- a/backends/platform/n64/framfs_save_manager.cpp
+++ b/backends/platform/n64/framfs_save_manager.cpp
@@ -34,7 +34,7 @@ uint32 InFRAMSave::read(void *buf, uint32 cnt) {
return framfs_read(buf, 1, cnt, fd);
}
-bool InFRAMSave::seek(int32 offs, int whence) {
+bool InFRAMSave::seek(int64 offs, int whence) {
framfs_seek(fd, offs, whence);
return true;
diff --git a/backends/platform/n64/pakfs_save_manager.cpp b/backends/platform/n64/pakfs_save_manager.cpp
index 5a83dab9d8..3674bf56f0 100644
--- a/backends/platform/n64/pakfs_save_manager.cpp
+++ b/backends/platform/n64/pakfs_save_manager.cpp
@@ -35,7 +35,7 @@ uint32 InPAKSave::read(void *buf, uint32 cnt) {
return pakfs_read(buf, 1, cnt, fd);
}
-bool InPAKSave::seek(int32 offs, int whence) {
+bool InPAKSave::seek(int64 offs, int whence) {
pakfs_seek(fd, offs, whence);
return true;
More information about the Scummvm-git-logs
mailing list