diff --git a/Core/FileSystems/VirtualDiscFileSystem.cpp b/Core/FileSystems/VirtualDiscFileSystem.cpp index 9fd75229d9..96a4db7169 100644 --- a/Core/FileSystems/VirtualDiscFileSystem.cpp +++ b/Core/FileSystems/VirtualDiscFileSystem.cpp @@ -268,7 +268,7 @@ int VirtualDiscFileSystem::getFileListIndex(std::string& fileName) fileList.push_back(entry); - return fileList.size()-1; + return (int)fileList.size()-1; } int VirtualDiscFileSystem::getFileListIndex(u32 accessBlock, u32 accessSize, bool blockMode) diff --git a/Core/FileSystems/VirtualDiscFileSystem.h b/Core/FileSystems/VirtualDiscFileSystem.h index 14341e1dc1..05b712e148 100644 --- a/Core/FileSystems/VirtualDiscFileSystem.h +++ b/Core/FileSystems/VirtualDiscFileSystem.h @@ -124,9 +124,9 @@ private: HandlerFileHandle handler; VirtualFileType type; u32 fileIndex; - u32 curOffset; - u32 startOffset; // only used by lbn files - u32 size; // only used by lbn files + u64 curOffset; + u64 startOffset; // only used by lbn files + u64 size; // only used by lbn files bool Open(std::string& basePath, std::string& fileName, FileAccess access) { if (handler.IsValid()) { diff --git a/Core/HLE/sceNet.cpp b/Core/HLE/sceNet.cpp index 517933fa2e..8d6aa610b8 100644 --- a/Core/HLE/sceNet.cpp +++ b/Core/HLE/sceNet.cpp @@ -305,8 +305,8 @@ int sceNetAdhocTerm() { int sceNetEtherNtostr(const char *mac, u32 bufferPtr) { DEBUG_LOG(HLE, "UNTESTED sceNetEtherNtostr(%s, %x)", mac, bufferPtr); if(Memory::IsValidAddress(bufferPtr)) { - size_t len = strlen(mac); - for (size_t i = 0; i < len; i++) + int len = (int)strlen(mac); + for (int i = 0; i < len; i++) Memory::Write_U8(mac[i], bufferPtr + i); } else diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp index 83824cb45b..0456f599e9 100644 --- a/UI/MiscScreens.cpp +++ b/UI/MiscScreens.cpp @@ -136,7 +136,7 @@ NewLanguageScreen::NewLanguageScreen() : ListPopupScreen("Language") { } } if (g_Config.languageIni == code) - selected = i; + selected = (int)i; listing.push_back(buttonTitle); }