Commit f0b34d49 authored by hybrid's avatar hybrid

Fixed some warnings. Fixed minimizeWidow under Linux.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2259 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 0aab2f19
...@@ -1161,7 +1161,7 @@ video::IVideoModeList* CIrrDeviceLinux::getVideoModeList() ...@@ -1161,7 +1161,7 @@ video::IVideoModeList* CIrrDeviceLinux::getVideoModeList()
void CIrrDeviceLinux::minimizeWindow() void CIrrDeviceLinux::minimizeWindow()
{ {
#ifdef _IRR_COMPILE_WITH_X11_ #ifdef _IRR_COMPILE_WITH_X11_
XUnmapWindow(display, window); XIconifyWindow(display, window, screennr);
#endif #endif
} }
......
...@@ -466,7 +466,7 @@ void CPLYMeshFileLoader::fillBuffer() ...@@ -466,7 +466,7 @@ void CPLYMeshFileLoader::fillBuffer()
else else
{ {
// read data from the file // read data from the file
s32 count = File->read(EndPointer, PLY_INPUT_BUFFER_SIZE - length); u32 count = File->read(EndPointer, PLY_INPUT_BUFFER_SIZE - length);
// increment the end pointer by the number of bytes read // increment the end pointer by the number of bytes read
EndPointer = EndPointer + count; EndPointer = EndPointer + count;
......
...@@ -102,7 +102,7 @@ bool CPLYMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 fla ...@@ -102,7 +102,7 @@ bool CPLYMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 fla
{ {
const core::vector3df& pos = mb->getPosition(j); const core::vector3df& pos = mb->getPosition(j);
const core::vector3df& n = mb->getNormal(j); const core::vector3df& n = mb->getNormal(j);
const core::vector2df& tc = mb->getTCoords(j); // const core::vector2df& tc = mb->getTCoords(j);
u8 *buf = (u8*)mb->getVertices(); u8 *buf = (u8*)mb->getVertices();
switch(mb->getVertexType()) switch(mb->getVertexType())
...@@ -117,7 +117,7 @@ bool CPLYMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 fla ...@@ -117,7 +117,7 @@ bool CPLYMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 fla
buf += sizeof(video::S3DVertexTangents)*j; buf += sizeof(video::S3DVertexTangents)*j;
break; break;
} }
video::SColor &col = ( (video::S3DVertex*)buf )->Color; // video::SColor &col = ( (video::S3DVertex*)buf )->Color;
// x y z nx ny nz red green blue alpha u v [u1 v1 | tx ty tz]\n // x y z nx ny nz red green blue alpha u v [u1 v1 | tx ty tz]\n
snprintf(outLine, 1024, snprintf(outLine, 1024,
......
...@@ -661,6 +661,8 @@ void CQ3LevelMesh::parser_parse( const void * data, const u32 size, CQ3LevelMesh ...@@ -661,6 +661,8 @@ void CQ3LevelMesh::parser_parse( const void * data, const u32 size, CQ3LevelMesh
} break; } break;
default:
break;
} }
} while ( Parser.tokenresult != Q3_TOKEN_EOF ); } while ( Parser.tokenresult != Q3_TOKEN_EOF );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment