ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/supertuxkart/stk-code

Browse Source
This commit is contained in:
Marianne Gagnon 2014-09-20 20:48:12 -04:00
commit 58e20bebd7
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/config/hardware_stats.cpp
View File

@ -69,6 +69,8 @@ int getRAM()
memory_size /= (1024*1024);
return int(memory_size);
#endif
Log::error("HW report",
"No RAM information available for hardware report.");
return 0;
} // getRAM
@ -95,6 +97,9 @@ int getNumProcessors()
assert(ret != -1);
return ncpus;
#endif
Log::error("HW report",
"Number of processors not available for hardware report.");
return 0;
} // getNumProcessors
// ----------------------------------------------------------------------------

2
src/graphics/material.cpp
View File

@ -696,7 +696,7 @@ void Material::setMaterialProperties(video::SMaterial *m, scene::IMeshBuffer* m
}
else
{
glossytex = getUnicolorTexture(SColor(0., 0., 0., 0.));
glossytex = getUnicolorTexture(SColor(0, 0, 0, 0));
}
switch (m_shader_type)
{