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_EventManager.cpp
+++ b/source/gameengine/GameLogic/SCA_EventManager.cpp
@@ -35,8 +35,9 @@
 #endif


-SCA_EventManager::SCA_EventManager(EVENT_MANAGER_TYPE mgrtype)
-	:m_mgrtype(mgrtype)
+SCA_EventManager::SCA_EventManager(SCA_LogicManager* logicmgr, EVENT_MANAGER_TYPE mgrtype)
+	:m_logicmgr(logicmgr),
+	m_mgrtype(mgrtype)
 {
 }