[Scummvm-git-logs] scummvm master -> 95d581e853a338dd31485f859af2f3df61bcd731

aquadran aquadran at gmail.com
Mon Mar 8 11:29:20 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:
95d581e853 ICB: int -> int32 fixes


Commit: 95d581e853a338dd31485f859af2f3df61bcd731
    https://github.com/scummvm/scummvm/commit/95d581e853a338dd31485f859af2f3df61bcd731
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2021-03-08T12:29:14+01:00

Commit Message:
ICB: int -> int32 fixes

Changed paths:
    engines/icb/common/px_clu_api.h
    engines/icb/common/px_string.h


diff --git a/engines/icb/common/px_clu_api.h b/engines/icb/common/px_clu_api.h
index c5ff65da42..2859f90081 100644
--- a/engines/icb/common/px_clu_api.h
+++ b/engines/icb/common/px_clu_api.h
@@ -90,7 +90,7 @@ typedef struct Cluster_API {
 	                     // file data
 } Cluster_API;
 
-#define FILE_NAME(a) (sizeof(uint) + sizeof(uint) + sizeof(HEADER_OPEN) + (sizeof(HEADER_NORMAL) * (a)))
+#define FILE_NAME(a) (sizeof(uint) + sizeof(uint32) + sizeof(HEADER_OPEN) + (sizeof(HEADER_NORMAL) * (a)))
 #define FILE_SIZE(a) (FILE_NAME(a) + sizeof(uint32))
 #define FILE_OFFSET(a) (FILE_SIZE(a) + sizeof(uint32))
 #define FILE_HASH(a) (FILE_OFFSET(a) + sizeof(uint32))
diff --git a/engines/icb/common/px_string.h b/engines/icb/common/px_string.h
index a10ca23491..9e8f0e0dff 100644
--- a/engines/icb/common/px_string.h
+++ b/engines/icb/common/px_string.h
@@ -107,7 +107,7 @@ public:
 	pxFlexiCharBuffer(uint32 len = 40);
 	~pxFlexiCharBuffer();
 
-	char &operator[](uint); // Allow array access
+	char &operator[](uint32); // Allow array access
 	void CheckSize(uint32);   // Make sure we have enough room
 	char *GetBuffer() {
 		return (m_buffer); // Make it a little more difficult to pass the pointer




More information about the Scummvm-git-logs mailing list