Merges in Monkey's fixes PR with a resolution for a conflict

This commit is contained in:
Areloch 2015-09-03 22:58:57 -05:00
commit bedc79aacb
22 changed files with 131 additions and 74 deletions

View file

@ -998,7 +998,7 @@ S32 Platform::getFileSize(const char *pFilePath)
return -1;
// must be a real file then
return findData.nFileSizeLow;
return ((findData.nFileSizeHigh * (MAXDWORD+1)) + findData.nFileSizeLow);
}