luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

Merging r6364 through r6379 from trunk to ogl-es branch

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6380 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2022-05-04 21:38:12 +00:00
parent 993f990036
commit 67a488fc5c
227 changed files with 19006 additions and 5574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/GUIEditor/CMemoryReadWriteFile.cpp
View File

@@ -21,12 +21,12 @@ size_t CMemoryReadWriteFile::write(const void* buffer, size_t sizeToWrite)
// expand size
if (Pos + sizeToWrite > Data.size())
Data.set_used(Pos+sizeToWrite);
Data.set_used((u32)(Pos+sizeToWrite));
// copy data
memcpy( (void*) &Data[Pos], buffer, sizeToWrite);
Pos += sizeToWrite;
Pos += (long)sizeToWrite;
return sizeToWrite;
@@ -46,7 +46,7 @@ bool CMemoryReadWriteFile::seek(long finalPos, bool relativeMovement)
Pos = finalPos;
}
if (Pos > (s32)Data.size())
if (Pos > (long)Data.size())
Data.set_used(Pos+1);
return true;