merge with trunk/2.5 at r23876

[[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
parent 36bb566d4e
commit 8f788c64db
1313 changed files with 104799 additions and 120780 deletions
--- a/source/gameengine/GameLogic/SCA_MouseManager.cpp
+++ b/source/gameengine/GameLogic/SCA_MouseManager.cpp
@@ -48,9 +48,8 @@

 SCA_MouseManager::SCA_MouseManager(SCA_LogicManager* logicmgr,
 								   SCA_IInputDevice* mousedev)
-	:	SCA_EventManager(MOUSE_EVENTMGR),
-		m_mousedevice (mousedev),
-		m_logicmanager(logicmgr)
+	:	SCA_EventManager(logicmgr, MOUSE_EVENTMGR),
+		m_mousedevice (mousedev)
 {
 	m_xpos = 0;
 	m_ypos = 0;
@@ -93,7 +92,7 @@ void SCA_MouseManager::NextFrame()
 				mousesensor->setX(mx);
 				mousesensor->setY(my);
 				
-				mousesensor->Activate(m_logicmanager);
+				mousesensor->Activate(m_logicmgr);
 			}
 		}
 	}