Commit c1cc18eb authored by gerstrong@gmail.com's avatar gerstrong@gmail.com

Macro improvements

parent a5b3f01b
......@@ -941,6 +941,7 @@ void CInput::pollEvents()
const Vector2D<int> rotPt(Event.motion.x, Event.motion.y);
transMouseRelCoord(Pos, Event.motion, activeArea, tiltedScreen);
#ifdef VIRTUALPAD
if(gVideoDriver.VGamePadEnabled() && mpVirtPad &&
mpVirtPad->active())
{
......@@ -953,6 +954,7 @@ void CInput::pollEvents()
}
}
else
#endif
{
m_EventList.add( new PointingDevEvent( Pos, PDE_MOVED ) );
gPointDevice.mPointingState.mPos = Pos;
......
......@@ -159,12 +159,14 @@ bool CGameLauncher::setupMenu()
0.75f ),
GsRect<float>(0.0f, 0.0f, 0.069f, 0.069f) );
#ifdef VIRTUALPAD
mLauncherDialog.addControl(new GsButton( "VPad", new OpenVGamePadSettingsEvent(),
GsControl::Style::NONE,
0.75f,
1.0f,
1.0f ),
GsRect<float>(0.75f, 0.0f, 0.17f, 0.069f) );
#endif
mLauncherDialog.addControl(new GsButton( "|", new OpenSettingsMenuEvent(),
......
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