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

dkasak13 at users.sourceforge.net dkasak13 at users.sourceforge.net
Mon Jul 27 07:34:23 CEST 2009


Revision: 42841
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42841&view=rev
Author:   dkasak13
Date:     2009-07-27 05:34:22 +0000 (Mon, 27 Jul 2009)

Log Message:
-----------
Enabled running of look/use scripts on left/right mouse button press for testing (Warning: unstable in some places).

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-27 05:30:58 UTC (rev 42840)
+++ scummvm/branches/gsoc2009-draci/engines/draci/game.cpp	2009-07-27 05:34:22 UTC (rev 42841)
@@ -178,8 +178,10 @@
 		}
 
 		int animUnderCursor = _vm->_anims->getTopAnimationID(x, y);
+		Animation *anim = _vm->_anims->getAnimation(animUnderCursor);
 
 		int curObject = getObjectWithAnimation(animUnderCursor);
+		GameObject *obj = &_objects[curObject];
 
 		Animation *atitle = _vm->_anims->getAnimation(kTitleText);
 
@@ -187,9 +189,19 @@
 
 		atitle->deleteFrames();
 		if (curObject != kNotFound) {					
-			GameObject *obj = &_objects[curObject];
 			Text *title = new Text (obj->_title, _vm->_bigFont, kFontColour1, 0, 0);
 			atitle->addFrame(title);
+
+			// HACK: Test running look and use scripts
+			if (_vm->_mouse->lButtonPressed()) {
+				_vm->_script->run(obj->_program, obj->_look);
+				_vm->_mouse->lButtonSet(false);				
+			}
+
+			if (_vm->_mouse->rButtonPressed()) {
+				_vm->_script->run(obj->_program, obj->_use);
+				_vm->_mouse->rButtonSet(false);				
+			}
 		}
 
 		debugC(2, kDraciAnimationDebugLevel, "Anim under cursor: %d", animUnderCursor); 


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




More information about the Scummvm-git-logs mailing list