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_RandomEventManager.cpp
+++ b/source/gameengine/GameLogic/SCA_RandomEventManager.cpp
@@ -42,8 +42,7 @@ using namespace std;
 #endif

 SCA_RandomEventManager::SCA_RandomEventManager(class SCA_LogicManager* logicmgr)
-		: SCA_EventManager(RANDOM_EVENTMGR),
-		m_logicmgr(logicmgr)
+		: SCA_EventManager(logicmgr, RANDOM_EVENTMGR)
 {
 }