[Scummvm-cvs-logs] SF.net SVN: scummvm: [23649] scummvm/trunk/engines/kyra
vinterstum at users.sourceforge.net
vinterstum at users.sourceforge.net
Tue Aug 1 01:05:10 CEST 2006
Revision: 23649
Author: vinterstum
Date: 2006-07-31 16:05:01 -0700 (Mon, 31 Jul 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=23649&view=rev
Log Message:
-----------
Committing patch '[ 1531177 ] Kyra2 mock-up' by eriktorbjorn, with the addition of playing the music tracks as well (Only MIDI works for now though)
Modified Paths:
--------------
scummvm/trunk/engines/kyra/kyra2.cpp
scummvm/trunk/engines/kyra/kyra2.h
scummvm/trunk/engines/kyra/module.mk
Added Paths:
-----------
scummvm/trunk/engines/kyra/sequences_v2.cpp
Modified: scummvm/trunk/engines/kyra/kyra2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra2.cpp 2006-07-31 16:37:34 UTC (rev 23648)
+++ scummvm/trunk/engines/kyra/kyra2.cpp 2006-07-31 23:05:01 UTC (rev 23649)
@@ -22,8 +22,6 @@
#include "kyra/kyra.h"
#include "kyra/kyra2.h"
-#include "kyra/screen.h"
-#include "kyra/wsamovie.h"
#include "common/system.h"
@@ -37,24 +35,7 @@
}
int KyraEngine_v2::go() {
- uint8 pal[768];
-
- WSAMovieV2 *title = new WSAMovieV2(this);
- title->open("title.WSA", 0, pal);
- assert(title->opened());
-
- _screen->setScreenPalette(pal);
- title->setX(0); title->setY(0);
- title->setDrawPage(0);
- for (int i = 0; i < 26 && !_quitFlag; ++i) {
- uint32 nextRun = _system->getMillis() + 6 * _tickLength;
- title->displayFrame(i);
- _screen->updateScreen();
- delayUntil(nextRun);
- }
-
- delete title;
-
+ seq_menu();
waitForEvent();
return 0;
}
Modified: scummvm/trunk/engines/kyra/kyra2.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra2.h 2006-07-31 16:37:34 UTC (rev 23648)
+++ scummvm/trunk/engines/kyra/kyra2.h 2006-07-31 23:05:01 UTC (rev 23649)
@@ -33,6 +33,9 @@
int setupGameFlags() { _game = GI_KYRA2; return 0; }
int go();
+
+protected:
+ void seq_menu();
};
} // end of namespace Kyra
Modified: scummvm/trunk/engines/kyra/module.mk
===================================================================
--- scummvm/trunk/engines/kyra/module.mk 2006-07-31 16:37:34 UTC (rev 23648)
+++ scummvm/trunk/engines/kyra/module.mk 2006-07-31 23:05:01 UTC (rev 23649)
@@ -17,6 +17,7 @@
script.o \
seqplayer.o \
sequences_v1.o \
+ sequences_v2.o \
sound_adlib.o \
sound_digital.o \
sound.o \
Added: scummvm/trunk/engines/kyra/sequences_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_v2.cpp (rev 0)
+++ scummvm/trunk/engines/kyra/sequences_v2.cpp 2006-07-31 23:05:01 UTC (rev 23649)
@@ -0,0 +1,105 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2005-2006 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "kyra/kyra.h"
+#include "kyra/kyra2.h"
+#include "kyra/screen.h"
+#include "kyra/wsamovie.h"
+#include "kyra/sound.h"
+
+#include "common/system.h"
+
+namespace Kyra {
+
+void KyraEngine_v2::seq_menu() {
+ debugC(9, kDebugLevelMain, "KyraEngine_v2::seq_menu()");
+
+ _sound->loadMusicFile("K2INTRO");
+ _screen->loadBitmap("VIRGIN.CPS", 7, 7, _screen->_currentPalette);
+ _screen->copyRegion(0, 0, 0, 0, 320, 200, 6, 0);
+ _screen->updateScreen();
+ _screen->fadeFromBlack();
+ delay(60 * _tickLength);
+ _screen->fadeToBlack();
+ _screen->clearCurPage();
+
+ if (_quitFlag)
+ return;
+
+ uint8 pal[768];
+ int i;
+
+ _sound->playTrack(2);
+
+ WSAMovieV2 *title = new WSAMovieV2(this);
+ title->setDrawPage(0);
+
+ title->open("WESTWOOD.WSA", 0, pal);
+ assert(title->opened());
+
+ title->setX(0); title->setY(0);
+ title->displayFrame(0);
+ _screen->updateScreen();
+ _screen->fadePalette(pal, 0x54);
+
+ for (i = 1; i < 18 && !_quitFlag; ++i) {
+ uint32 nextRun = _system->getMillis() + 6 * _tickLength;
+ title->displayFrame(i);
+ _screen->updateScreen();
+ delayUntil(nextRun);
+ }
+
+ title->close();
+
+ _screen->fadeToBlack();
+ _screen->clearCurPage();
+
+ if (_quitFlag) {
+ delete title;
+ return;
+ }
+
+ _sound->playTrack(3);
+
+ title->open("TITLE.WSA", 0, pal);
+ assert(title->opened());
+
+ title->setX(0); title->setY(0);
+ title->displayFrame(0);
+ _screen->updateScreen();
+ _screen->fadePalette(pal, 0x54);
+
+ for (i = 1; i < 26 && !_quitFlag; ++i) {
+ uint32 nextRun = _system->getMillis() + 6 * _tickLength;
+ title->displayFrame(i);
+ _screen->updateScreen();
+ delayUntil(nextRun);
+ }
+
+ title->close();
+
+ _sound->beginFadeOut();
+
+ delete title;
+}
+
+} // end of namespace Kyra
Property changes on: scummvm/trunk/engines/kyra/sequences_v2.cpp
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Rev Author URL Id
Name: svn:eol-style
+ native
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