[Scummvm-git-logs] scummvm master -> 752c82fb3bbce70ed8df4fb2b8ca4b7c9951bc7d
yuv422
noreply at scummvm.org
Sat Jan 25 05:28:14 UTC 2025
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:
752c82fb3b JANITORIAL: Fixed some warnings in MSVC
Commit: 752c82fb3bbce70ed8df4fb2b8ca4b7c9951bc7d
https://github.com/scummvm/scummvm/commit/752c82fb3bbce70ed8df4fb2b8ca4b7c9951bc7d
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2025-01-25T16:27:34+11:00
Commit Message:
JANITORIAL: Fixed some warnings in MSVC
Changed paths:
engines/advancedDetector.h
engines/darkseed/tostext.cpp
diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h
index 5a23074c5ea..f199166b4dd 100644
--- a/engines/advancedDetector.h
+++ b/engines/advancedDetector.h
@@ -46,11 +46,11 @@ class FSList;
namespace ADDynamicDescription {
static inline uint32 strSizeBuffer(const char * const &field) {
- return field ? strlen(field) + 1 : 0;
+ return field ? (uint32)strlen(field) + 1 : 0;
}
static inline void *strToBuffer(void *buffer, const char *&field) {
if (field) {
- int len = strlen(field) + 1;
+ int len = (int)strlen(field) + 1;
memcpy((char *)buffer, field, len);
field = (const char *)buffer;
buffer = (char *)buffer + len;
diff --git a/engines/darkseed/tostext.cpp b/engines/darkseed/tostext.cpp
index f85af34bae8..7a3bda42f74 100644
--- a/engines/darkseed/tostext.cpp
+++ b/engines/darkseed/tostext.cpp
@@ -49,7 +49,7 @@ Common::U32String TosText::loadString(Common::File &file, uint16 index) const {
file.seek(index * 2, SEEK_SET);
auto startOffset = file.readUint16LE();
uint16 strLen = index == _numEntries - 1
- ? file.size() - startOffset
+ ? (uint16)file.size() - startOffset
: file.readUint16LE() - startOffset;
file.seek(startOffset, SEEK_SET);
if (g_engine->getLanguage() == Common::KO_KOR || g_engine->getLanguage() == Common::ZH_ANY) {
More information about the Scummvm-git-logs
mailing list