Commit 24236447 authored by TheOnlyJoey's avatar TheOnlyJoey
Browse files

Merge pull request #5 from hymerman/tidying

General tidy-up
parents c546989f ed6e1ba6
...@@ -60,7 +60,7 @@ namespace OIS ...@@ -60,7 +60,7 @@ namespace OIS
virtual void capture(); virtual void capture();
/** @copydoc Object::queryInterface */ /** @copydoc Object::queryInterface */
virtual Interface* queryInterface(Interface::IType type) {return 0;} virtual Interface* queryInterface(Interface::IType type) { OIS_UNUSED(type); return 0; }
/** @copydoc Object::_initialize */ /** @copydoc Object::_initialize */
virtual void _initialize(); virtual void _initialize();
......
...@@ -41,7 +41,7 @@ namespace OIS ...@@ -41,7 +41,7 @@ namespace OIS
virtual void capture(); virtual void capture();
/** @copydoc Object::queryInterface */ /** @copydoc Object::queryInterface */
virtual Interface* queryInterface(Interface::IType type) {return 0;} virtual Interface* queryInterface(Interface::IType type) { OIS_UNUSED(type); return 0;}
/** @copydoc Object::_initialize */ /** @copydoc Object::_initialize */
virtual void _initialize(); virtual void _initialize();
......
...@@ -64,15 +64,6 @@ const char* Effect::getDirectionName(Effect::EDirection eValue) ...@@ -64,15 +64,6 @@ const char* Effect::getDirectionName(Effect::EDirection eValue)
return (eValue >= 0 && eValue < _DirectionsNumber) ? pszEDirectionString[eValue] : "<Bad direction>"; return (eValue >= 0 && eValue < _DirectionsNumber) ? pszEDirectionString[eValue] : "<Bad direction>";
} }
//------------------------------------------------------------------------------//
Effect::Effect() :
force(UnknownForce),
type(Unknown),
effect(0),
axes(1)
{
}
//------------------------------------------------------------------------------// //------------------------------------------------------------------------------//
Effect::Effect(EForce ef, EType et) : Effect::Effect(EForce ef, EType et) :
force(ef), force(ef),
......
...@@ -266,6 +266,8 @@ void InputManager::removeFactoryCreator( FactoryCreator* factory ) ...@@ -266,6 +266,8 @@ void InputManager::removeFactoryCreator( FactoryCreator* factory )
//----------------------------------------------------------------------------// //----------------------------------------------------------------------------//
void InputManager::enableAddOnFactory(AddOnFactories factory) void InputManager::enableAddOnFactory(AddOnFactories factory)
{ {
OIS_UNUSED(factory);
#if defined OIS_LIRC_SUPPORT #if defined OIS_LIRC_SUPPORT
if( factory == AddOn_LIRC || factory == AddOn_All ) if( factory == AddOn_LIRC || factory == AddOn_All )
{ {
......
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