griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merged 15771:15912 from trunk

Browse Source
This commit is contained in:
Ian Thompson
2008-08-01 23:39:52 +00:00
parent b767d406ad 7565990db2
commit ed5002458b
139 changed files with 3133 additions and 1475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/gameengine/GameLogic/SCA_JoystickManager.cpp
View File

@@ -52,9 +52,10 @@ SCA_JoystickManager::~SCA_JoystickManager()
void SCA_JoystickManager::NextFrame(double curtime,double deltatime)
{
for (unsigned int i = 0; i < m_sensors.size(); i++)
set<SCA_ISensor*>::iterator it;
for (it = m_sensors.begin(); it != m_sensors.end(); it++)
{
SCA_JoystickSensor* joysensor = (SCA_JoystickSensor*) m_sensors[i];
SCA_JoystickSensor* joysensor = (SCA_JoystickSensor*)(*it);
if(!joysensor->IsSuspended())
{
m_joystick->HandleEvents();
@@ -64,12 +65,6 @@ void SCA_JoystickManager::NextFrame(double curtime,double deltatime)
}
void SCA_JoystickManager::RegisterSensor(SCA_ISensor* sensor)
{
m_sensors.push_back(sensor);
}
SCA_Joystick *SCA_JoystickManager::GetJoystickDevice()
{
/*