[Scummvm-cvs-logs] SF.net SVN: scummvm: [24623] scummvm/trunk/engines/lure

dreammaster at users.sourceforge.net dreammaster at users.sourceforge.net
Sun Nov 5 07:57:08 CET 2006


Revision: 24623
          http://svn.sourceforge.net/scummvm/?rev=24623&view=rev
Author:   dreammaster
Date:     2006-11-04 22:56:58 -0800 (Sat, 04 Nov 2006)

Log Message:
-----------
Added display of the two special between room animations: falling down the chute and hiding in the barrel

Modified Paths:
--------------
    scummvm/trunk/engines/lure/game.cpp
    scummvm/trunk/engines/lure/luredefs.h

Modified: scummvm/trunk/engines/lure/game.cpp
===================================================================
--- scummvm/trunk/engines/lure/game.cpp	2006-11-05 06:26:45 UTC (rev 24622)
+++ scummvm/trunk/engines/lure/game.cpp	2006-11-05 06:56:58 UTC (rev 24623)
@@ -251,8 +251,11 @@
 }
 
 void Game::playerChangeRoom() {
+	OSystem &system = System::getReference();
 	Resources &res = Resources::getReference();
+	Screen &screen = Screen::getReference();
 	Room &room = Room::getReference();
+	Mouse &mouse = Mouse::getReference();
 	ValueTableData &fields = res.fieldList();
 	SequenceDelayList &delayList = Resources::getReference().delayList();
 
@@ -265,6 +268,28 @@
 	assert(roomData);
 	roomData->flags |= HOTSPOTFLAG_FOUND;
 
+	// Check for any room change animation
+
+	int animFlag = fields.getField(ROOM_EXIT_ANIMATION);
+	if (animFlag == 1)
+	{
+		Palette palette(CHUTE_PALETTE_ID);
+		AnimationSequence *anim = new AnimationSequence(screen, system, 
+			CHUTE_ANIM_ID, palette, false);
+		mouse.cursorOff();
+		anim->show();
+		mouse.cursorOn();
+	} else if (animFlag != 0)
+	{
+		Palette palette(BARREL_PALETTE_ID);
+		AnimationSequence *anim = new AnimationSequence(screen, system, 
+			BARREL_ANIM_ID, palette, false);
+		mouse.cursorOff();
+		anim->show();
+		mouse.cursorOn();
+	}
+
+	// Change to the new room
 	Hotspot *player = res.getActiveHotspot(PLAYER_ID);
 	player->currentActions().clear();
 	player->setRoomNumber(roomNum);

Modified: scummvm/trunk/engines/lure/luredefs.h
===================================================================
--- scummvm/trunk/engines/lure/luredefs.h	2006-11-05 06:26:45 UTC (rev 24622)
+++ scummvm/trunk/engines/lure/luredefs.h	2006-11-05 06:56:58 UTC (rev 24623)
@@ -115,6 +115,12 @@
 // Palette and animation for Skorl catching player
 #define SKORL_CATCH_PALETTE_ID 0x4060
 #define SKORL_CATCH_ANIM_ID 0x4061
+// Palette and animation for chute animation
+#define CHUTE_PALETTE_ID 0x404C
+#define CHUTE_ANIM_ID 0x404D
+// Palette and animation for hiding in barrel
+#define BARREL_PALETTE_ID 0xE9F0
+#define BARREL_ANIM_ID 0xE9F1
 
 // Specifies the maximum buffer sized allocated for decoding animation data
 #define MAX_ANIM_DECODER_BUFFER_SIZE 300000


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