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

[dkasak13 at users.sourceforge.net]

Revision: 42236
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42236&view=rev
Author:   dkasak13
Date:     2009-07-07 19:50:12 +0000 (Tue, 07 Jul 2009)

Log Message:
-----------
Added enum constant for the dragon object (kDragonObject) and made Script::start() a bit more readable.

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

Modified: scummvm/branches/gsoc2009-draci/engines/draci/game.cpp
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/game.cpp	2009-07-07 19:18:53 UTC (rev 42235)
+++ scummvm/branches/gsoc2009-draci/engines/draci/game.cpp	2009-07-07 19:50:12 UTC (rev 42236)
@@ -134,7 +134,7 @@
 }
 
 void Game::init() {
-	loadObject(0);
+	loadObject(kDragonObject);
 	
 	_vm->_script->run(getObject(0)->_program, getObject(0)->_init);
 

Modified: scummvm/branches/gsoc2009-draci/engines/draci/game.h
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/game.h	2009-07-07 19:18:53 UTC (rev 42235)
+++ scummvm/branches/gsoc2009-draci/engines/draci/game.h	2009-07-07 19:50:12 UTC (rev 42236)
@@ -35,6 +35,10 @@
 
 class DraciEngine;
 
+enum {
+	kDragonObject
+};
+
 enum StructSizes {
 	personSize = sizeof(uint16) * 2 + sizeof(byte)
 };

Modified: scummvm/branches/gsoc2009-draci/engines/draci/script.cpp
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/script.cpp	2009-07-07 19:18:53 UTC (rev 42235)
+++ scummvm/branches/gsoc2009-draci/engines/draci/script.cpp	2009-07-07 19:50:12 UTC (rev 42236)
@@ -234,8 +234,10 @@
 	int animID = params.pop() - 1;
 
 	GameObject *obj = _vm->_game->getObject(objID);
+	
+	bool visible = (objID == kDragonObject || obj->_visible);
 
-	if ( ((objID == 0) || (obj->_visible)) && (obj->_location == _vm->_game->getRoomNum()))
+	if (visible && (obj->_location == _vm->_game->getRoomNum()))
 		_vm->_anims->play(animID);
 }
 


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