Merging r6075 through r6106 from trunk to ogl-es branch.

Burnings renderer changes.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6116 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2020-06-12 20:41:49 +00:00
parent 084e0e669a
commit 20b3d56987
117 changed files with 10384 additions and 3817 deletions

View File

@ -187,7 +187,8 @@ bool COSOperator::getProcessorSpeedMHz(u32* MHz) const
if (file)
{
char buffer[1024];
fread(buffer, 1, 1024, file);
size_t r = fread(buffer, 1, 1023, file);
buffer[r] = 0;
buffer[1023]=0;
core::stringc str(buffer);
s32 pos = str.find("cpu MHz");