this is a more "clean" conversion to 64 bit than the type-fixups branch, which does borrow some elements from it but has far less find and replace...it is about 98-99% done, notes to follow later

This commit is contained in:
DarthArgus
2017-01-24 03:35:59 +00:00
parent 42b949c3dc
commit 36686348e9
458 changed files with 2282 additions and 2367 deletions
@@ -166,7 +166,7 @@ void FileStreamerThread::processRead(volatile Request *request)
{
NOT_NULL(request);
// shortcut to the file
// int16_tcut to the file
OsFile *osFile = request->osFile;
// seek to the requested offset
@@ -1551,7 +1551,7 @@ void Iff::read_string(char *string, int maxLength)
for ( ; *source; ++string, ++source, ++s.used, --maxLength)
{
DEBUG_FATAL(s.used >= s.length, ("hit end of chunk before string terminator"));
DEBUG_FATAL(maxLength <= 0, ("destination string too short"));
DEBUG_FATAL(maxLength <= 0, ("destination string too int16_t"));
*string = *source;
}
@@ -1559,7 +1559,7 @@ void Iff::read_string(char *string, int maxLength)
++s.used;
// nullptr terminate the output string
DEBUG_FATAL(maxLength <= 0, ("destination string too short"));
DEBUG_FATAL(maxLength <= 0, ("destination string too int16_t"));
*string = '\0';
}
@@ -1667,7 +1667,7 @@ std::string Iff::read_stdstring()
void Iff::read_string(Unicode::String &str)
{
const int32 count = read_int32 ();
unsigned short * data = new unsigned short [count];
uint16_t * data = new uint16_t [count];
read_uint16 (count, data);
str.assign (data, static_cast<size_t>(count));
delete [] data;
@@ -505,7 +505,7 @@ int TreeFile::getFileSize(const char *fileName)
// ----------------------------------------------------------------------
/**
* This function assumes the output buffer is large enough.
* The output path will be the same length or shorter than the input path.
* The output path will be the same length or int16_ter than the input path.
*/
void TreeFile::fixUpFileName(char *output, const char *fileName, bool warning)
@@ -800,7 +800,7 @@ const char *TreeFile::getSearchPath(int index)
//-----------------------------------------------------------------
/**
* This function will return the shortest trailing path of its input that
* This function will return the int16_test trailing path of its input that
* can be loaded by the TreeFile. If no files can be loaded, this routine
* will return nullptr.
*/