[Scummvm-cvs-logs] SF.net SVN: scummvm:[45965] scummvm/trunk/engines/teenagent

megath at users.sourceforge.net megath at users.sourceforge.net
Tue Nov 17 23:45:42 CET 2009


Revision: 45965
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45965&view=rev
Author:   megath
Date:     2009-11-17 22:45:41 +0000 (Tue, 17 Nov 2009)

Log Message:
-----------
added kEffect for screen shaking, fixed barman callback

Modified Paths:
--------------
    scummvm/trunk/engines/teenagent/callbacks.cpp
    scummvm/trunk/engines/teenagent/scene.cpp
    scummvm/trunk/engines/teenagent/scene.h
    scummvm/trunk/engines/teenagent/teenagent.cpp
    scummvm/trunk/engines/teenagent/teenagent.h

Modified: scummvm/trunk/engines/teenagent/callbacks.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/callbacks.cpp	2009-11-17 22:24:49 UTC (rev 45964)
+++ scummvm/trunk/engines/teenagent/callbacks.cpp	2009-11-17 22:45:41 UTC (rev 45965)
@@ -484,6 +484,7 @@
 				playSound(75, 10);
 				playSound(24, 15);
 				playAnimation(883, 0);
+				shakeScreen();
 				disableObject(1);
 				disableObject(2);
 				SET_FLAG(0xDBE9, 1);
@@ -551,7 +552,7 @@
 			playSound(89, 5);
 			playActorAnimation(958);
 			loadScene(9, 240, 182, 4);
-		} else if (CHECK_FLAG(0xDBE9, 1)) {
+		} else if (CHECK_FLAG(0xDBE7, 1)) {
 			displayMessage(0x5894);
 		} else {
 			Dialog::pop(scene, 0xDB8A, 0, 857, 0xd1, 0xef, 0, 1);

Modified: scummvm/trunk/engines/teenagent/scene.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/scene.cpp	2009-11-17 22:24:49 UTC (rev 45964)
+++ scummvm/trunk/engines/teenagent/scene.cpp	2009-11-17 22:45:41 UTC (rev 45965)
@@ -580,9 +580,9 @@
 			return true;
 		}
 
-		if (background.pixels && debug_features.feature[DebugFeatures::kShowBack])
+		if (background.pixels && debug_features.feature[DebugFeatures::kShowBack]) {
 			system->copyRectToScreen((const byte *)background.pixels, background.pitch, 0, 0, background.w, background.h);
-		else
+		} else
 			system->fillScreen(0);
 
 		Graphics::Surface *surface = system->lockScreen();
@@ -995,11 +995,16 @@
 			current_event.clear();
 			break;
 
+		case SceneEvent::kEffect:
+			debug(0, "*stub* shaking the screen");
+			current_event.clear();
+			break;
+
 		case SceneEvent::kQuit:
 			debug(0, "quit!");
 			_engine->quitGame();
 			break;
-
+			
 		default:
 			error("empty/unhandler event[%d]", (int)current_event.type);
 		}

Modified: scummvm/trunk/engines/teenagent/scene.h
===================================================================
--- scummvm/trunk/engines/teenagent/scene.h	2009-11-17 22:24:49 UTC (rev 45964)
+++ scummvm/trunk/engines/teenagent/scene.h	2009-11-17 22:45:41 UTC (rev 45965)
@@ -58,6 +58,7 @@
 		kWaitLanAnimationFrame,
 		kCreditsMessage,		//16
 		kTimer,
+		kEffect,
 		kQuit
 	} type;
 

Modified: scummvm/trunk/engines/teenagent/teenagent.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/teenagent.cpp	2009-11-17 22:24:49 UTC (rev 45964)
+++ scummvm/trunk/engines/teenagent/teenagent.cpp	2009-11-17 22:45:41 UTC (rev 45965)
@@ -623,6 +623,11 @@
 	scene->push(event);
 }
 
+void TeenAgentEngine::shakeScreen() {
+	SceneEvent event(SceneEvent::kEffect);
+	scene->push(event);
+}
+
 void TeenAgentEngine::playSoundNow(byte id) {
 	Resources *res = Resources::instance();
 	Common::SeekableReadStream *in = res->sam_sam.getStream(id);

Modified: scummvm/trunk/engines/teenagent/teenagent.h
===================================================================
--- scummvm/trunk/engines/teenagent/teenagent.h	2009-11-17 22:24:49 UTC (rev 45964)
+++ scummvm/trunk/engines/teenagent/teenagent.h	2009-11-17 22:45:41 UTC (rev 45965)
@@ -96,6 +96,7 @@
 	void waitAnimation();
 	void waitLanAnimationFrame(byte slot, uint16 frame);
 	void setTimerCallback(uint16 addr, uint16 frames);
+	void shakeScreen();
 
 	Common::RandomSource random;
 


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