2.50:

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19820:HEAD

Notes:
* Game and sequencer RNA, and sequencer header are now out of date
  a bit after changes in trunk.
* I didn't know how to port these bugfixes, most likely they are
  not needed anymore.
  * Fix "duplicate strip" always increase the user count for ipo.
  * IPO pinning on sequencer strips was lost during Undo.

1 files changed, 6 insertions, 5 deletions

diff --git a/source/gameengine/GameLogic/SCA_JoystickManager.cpp b/source/gameengine/GameLogic/SCA_JoystickManager.cpp
index f3ce549a637..ff8f3b1c81f 100644
--- a/source/gameengine/GameLogic/SCA_JoystickManager.cpp
+++ b/source/gameengine/GameLogic/SCA_JoystickManager.cpp
@@ -59,20 +59,21 @@ SCA_JoystickManager::~SCA_JoystickManager()
 
 void SCA_JoystickManager::NextFrame(double curtime,double deltatime)
 {
-	if (m_sensors.size()==0) {
+	if (m_sensors.Empty()) {
 		return;
 	}
 	else {
-		set<SCA_ISensor*>::iterator it;
+		;
 #ifndef	DISABLE_SDL
 		SCA_Joystick::HandleEvents(); /* Handle all SDL Joystick events */
 #endif
-		for (it = m_sensors.begin(); it != m_sensors.end(); it++)
+		SG_DList::iterator<SCA_JoystickSensor> it(m_sensors);
+		for (it.begin();!it.end();++it)
 		{
-			SCA_JoystickSensor* joysensor = (SCA_JoystickSensor*)(*it);
+			SCA_JoystickSensor* joysensor = *it;
 			if(!joysensor->IsSuspended())
 			{
-				joysensor->Activate(m_logicmgr, NULL);
+				joysensor->Activate(m_logicmgr);
 			}
 		}
 	}