Silence even more warnings
This commit is contained in:
parent
d8efe01d02
commit
f386f05749
@ -83,6 +83,8 @@ enet_protocol_dispatch_incoming_commands (ENetHost * host, ENetEvent * event)
|
|||||||
}
|
}
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -863,6 +865,8 @@ enet_protocol_handle_acknowledge (ENetHost * host, ENetEvent * event, ENetPeer *
|
|||||||
enet_list_empty (& peer -> sentReliableCommands))
|
enet_list_empty (& peer -> sentReliableCommands))
|
||||||
enet_peer_disconnect (peer, peer -> eventData);
|
enet_peer_disconnect (peer, peer -> eventData);
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -1867,6 +1867,9 @@ public:
|
|||||||
// Attribute implemented for texture references
|
// Attribute implemented for texture references
|
||||||
class CTextureAttribute : public IAttribute
|
class CTextureAttribute : public IAttribute
|
||||||
{
|
{
|
||||||
|
// Explicitly hide base method
|
||||||
|
using IAttribute::setTexture;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
CTextureAttribute(const char* name, video::ITexture* value, video::IVideoDriver* driver, const io::path& filename)
|
CTextureAttribute(const char* name, video::ITexture* value, video::IVideoDriver* driver, const io::path& filename)
|
||||||
|
@ -697,6 +697,8 @@ void CColorConverter::convert_viaFormat(const void* sP, ECOLOR_FORMAT sF, s32 sN
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -233,7 +233,6 @@ void CGUIButton::draw()
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
IGUISkin* skin = Environment->getSkin();
|
IGUISkin* skin = Environment->getSkin();
|
||||||
video::IVideoDriver* driver = Environment->getVideoDriver();
|
|
||||||
|
|
||||||
// todo: move sprite up and text down if the pressed state has a sprite
|
// todo: move sprite up and text down if the pressed state has a sprite
|
||||||
const core::position2di spritePos = AbsoluteRect.getCenter();
|
const core::position2di spritePos = AbsoluteRect.getCenter();
|
||||||
@ -254,6 +253,7 @@ void CGUIButton::draw()
|
|||||||
core::recti(pos, ImageRect.getSize()),
|
core::recti(pos, ImageRect.getSize()),
|
||||||
ImageRect, &AbsoluteClippingRect,
|
ImageRect, &AbsoluteClippingRect,
|
||||||
0, UseAlphaChannel);
|
0, UseAlphaChannel);
|
||||||
|
//video::IVideoDriver* driver = Environment->getVideoDriver();
|
||||||
//driver->draw2DImage(Image,
|
//driver->draw2DImage(Image,
|
||||||
// ScaleImage? AbsoluteRect :
|
// ScaleImage? AbsoluteRect :
|
||||||
// core::recti(pos, ImageRect.getSize()),
|
// core::recti(pos, ImageRect.getSize()),
|
||||||
|
@ -27,7 +27,7 @@ CParticleRingEmitter::CParticleRingEmitter(
|
|||||||
MaxParticlesPerSecond(maxParticlesPerSecond),
|
MaxParticlesPerSecond(maxParticlesPerSecond),
|
||||||
MinStartColor(minStartColor), MaxStartColor(maxStartColor),
|
MinStartColor(minStartColor), MaxStartColor(maxStartColor),
|
||||||
MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax),
|
MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax),
|
||||||
Time(0), Emitted(0), MaxAngleDegrees(maxAngleDegrees)
|
Time(0), MaxAngleDegrees(maxAngleDegrees)
|
||||||
{
|
{
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
setDebugName("CParticleRingEmitter");
|
setDebugName("CParticleRingEmitter");
|
||||||
|
@ -136,7 +136,6 @@ private:
|
|||||||
u32 MinLifeTime, MaxLifeTime;
|
u32 MinLifeTime, MaxLifeTime;
|
||||||
|
|
||||||
u32 Time;
|
u32 Time;
|
||||||
u32 Emitted;
|
|
||||||
s32 MaxAngleDegrees;
|
s32 MaxAngleDegrees;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -2286,6 +2286,7 @@ IMeshWriter* CSceneManager::createMeshWriter(EMESH_WRITER_TYPE type)
|
|||||||
case EMWT_COLLADA:
|
case EMWT_COLLADA:
|
||||||
case EMWT_STL:
|
case EMWT_STL:
|
||||||
case EMWT_OBJ:
|
case EMWT_OBJ:
|
||||||
|
case EMWT_PLY:
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
#include "IrrCompileConfig.h"
|
#include "IrrCompileConfig.h"
|
||||||
|
|
||||||
static const char* const copyright = "Irrlicht Engine (c) 2002-2012 Nikolaus Gebhardt";
|
//static const char* const copyright = "Irrlicht Engine (c) 2002-2012 Nikolaus Gebhardt";
|
||||||
|
|
||||||
#ifdef _IRR_WINDOWS_
|
#ifdef _IRR_WINDOWS_
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user