[Scummvm-cvs-logs] SF.net SVN: scummvm:[42225] scummvm/branches/gsoc2009-draci/engines/draci/ game.cpp

[dkasak13 at users.sourceforge.net]

Revision: 42225
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42225&view=rev
Author:   dkasak13
Date:     2009-07-07 15:31:13 +0000 (Tue, 07 Jul 2009)

Log Message:
-----------
Stopped running the room init scripts twice.

Modified Paths:
--------------
    scummvm/branches/gsoc2009-draci/engines/draci/game.cpp

Modified: scummvm/branches/gsoc2009-draci/engines/draci/game.cpp
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/game.cpp	2009-07-07 15:21:41 UTC (rev 42224)
+++ scummvm/branches/gsoc2009-draci/engines/draci/game.cpp	2009-07-07 15:31:13 UTC (rev 42225)
@@ -183,6 +183,7 @@
 		}
 	}
 	
+	// Run the init scripts	for room objects
 	// We can't do this in the above loop because some objects' scripts reference
 	// other objects that may not yet be loaded
 	for (uint i = 0; i < _info->_numObjects; ++i) {
@@ -337,8 +338,6 @@
 	_currentRoom._roomNum = roomNum;
 	loadRoom(roomNum);
 	loadOverlays();
-
-	_vm->_script->run(_currentRoom._program, _currentRoom._init);
 }
 
 int Game::getRoomNum() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.