[Scummvm-cvs-logs] SF.net SVN: scummvm: [31877] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Mon May 5 18:14:45 CEST 2008
Revision: 31877
http://scummvm.svn.sourceforge.net/scummvm/?rev=31877&view=rev
Author: lordhoto
Date: 2008-05-05 09:14:45 -0700 (Mon, 05 May 2008)
Log Message:
-----------
- Fixed some palette fade times in Kyra3
- Changed behavior to match original when playing Kyra3 for the first time
- Fixed typo
Modified Paths:
--------------
scummvm/trunk/engines/kyra/gui_mr.cpp
scummvm/trunk/engines/kyra/kyra_mr.cpp
scummvm/trunk/engines/kyra/kyra_mr.h
scummvm/trunk/engines/kyra/scene_mr.cpp
Modified: scummvm/trunk/engines/kyra/gui_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_mr.cpp 2008-05-05 16:05:56 UTC (rev 31876)
+++ scummvm/trunk/engines/kyra/gui_mr.cpp 2008-05-05 16:14:45 UTC (rev 31877)
@@ -771,7 +771,7 @@
_displayMenu = false;
_vm->_runFlag = false;
_vm->fadeOutMusic(60);
- _screen->fadeToBlack();
+ _screen->fadeToBlack(60);
_screen->clearCurPage();
}
Modified: scummvm/trunk/engines/kyra/kyra_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_mr.cpp 2008-05-05 16:05:56 UTC (rev 31876)
+++ scummvm/trunk/engines/kyra/kyra_mr.cpp 2008-05-05 16:14:45 UTC (rev 31877)
@@ -89,7 +89,7 @@
_mainCharX = _mainCharY = -1;
_animList = 0;
_drawNoShapeFlag = false;
- _wsaPlayingVQA = false;
+ _wasPlayingVQA = false;
_lastCharPalLayer = -1;
_charPalUpdate = false;
_runFlag = false;
@@ -230,7 +230,14 @@
_screen->clearPage(0);
_screen->clearPage(2);
- if (_gameToLoad != -1) {
+ const bool firstTimeGame = !saveFileLoadable(0);
+
+ if (firstTimeGame) {
+ playVQA("K3INTRO");
+ _wasPlayingVQA = false;
+ }
+
+ if (_gameToLoad != -1 || firstTimeGame) {
uninitMainMenu();
_musicSoundChannel = -1;
startup();
@@ -265,14 +272,13 @@
case 2:
if (saveFileLoadable(0))
_menuDirectlyToLoad = true;
- else
- break;
+ // fall through
case 0:
uninitMainMenu();
fadeOutMusic(60);
- _screen->fadeToBlack();
+ _screen->fadeToBlack(60);
_musicSoundChannel = -1;
startup();
runLoop();
@@ -281,14 +287,14 @@
case 1:
playVQA("K3INTRO");
- _wsaPlayingVQA = false;
+ _wasPlayingVQA = false;
_screen->hideMouse();
break;
case 3:
default:
fadeOutMusic(60);
- _screen->fadeToBlack();
+ _screen->fadeToBlack(60);
uninitMainMenu();
quitGame();
running = false;
@@ -350,7 +356,7 @@
_screen->hideMouse();
memcpy(_screen->getPalette(1), _screen->getPalette(0), 768);
fadeOutMusic(60);
- _screen->fadeToBlack();
+ _screen->fadeToBlack(60);
_screen->clearPage(0);
vqa.setDrawPage(0);
@@ -366,7 +372,7 @@
_screen->setScreenPalette(pal);
_screen->clearPage(0);
memcpy(_screen->getPalette(0), _screen->getPalette(1), 768);
- _wsaPlayingVQA = true;
+ _wasPlayingVQA = true;
}
}
Modified: scummvm/trunk/engines/kyra/kyra_mr.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_mr.h 2008-05-05 16:05:56 UTC (rev 31876)
+++ scummvm/trunk/engines/kyra/kyra_mr.h 2008-05-05 16:14:45 UTC (rev 31877)
@@ -570,7 +570,7 @@
// misc
TextDisplayer_MR *_text;
- bool _wsaPlayingVQA;
+ bool _wasPlayingVQA;
// resource specific
private:
Modified: scummvm/trunk/engines/kyra/scene_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_mr.cpp 2008-05-05 16:05:56 UTC (rev 31876)
+++ scummvm/trunk/engines/kyra/scene_mr.cpp 2008-05-05 16:14:45 UTC (rev 31877)
@@ -616,19 +616,19 @@
if (_noScriptEnter) {
memset(_screen->getPalette(0), 0, 432);
- if (!_wsaPlayingVQA)
+ if (!_wasPlayingVQA)
_screen->setScreenPalette(_screen->getPalette(0));
}
_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
if (_noScriptEnter) {
- if (!_wsaPlayingVQA)
+ if (!_wasPlayingVQA)
_screen->setScreenPalette(_screen->getPalette(2));
memcpy(_screen->getPalette(0), _screen->getPalette(2), 432);
- if (_wsaPlayingVQA) {
+ if (_wasPlayingVQA) {
_screen->fadeFromBlack(0x3C);
- _wsaPlayingVQA = false;
+ _wasPlayingVQA = false;
}
}
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