From cbcbdc08893bfcab69440e0d6f884d868fefadd0 Mon Sep 17 00:00:00 2001 From: Joseph Davies Date: Fri, 15 Feb 2013 07:30:08 -0800 Subject: [PATCH] Delay intro movie playback until after display init. - Fixes stretched cursor during movie playback. --- Sources/Plasma/Apps/plClient/plClient.cpp | 10 +++++----- .../Plasma/FeatureLib/pfJournalBook/pfJournalBook.h | 2 +- Sources/Plasma/PubUtilLib/plMessage/plMovieMsg.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Sources/Plasma/Apps/plClient/plClient.cpp b/Sources/Plasma/Apps/plClient/plClient.cpp index f3dbaf56..8db1ff5a 100644 --- a/Sources/Plasma/Apps/plClient/plClient.cpp +++ b/Sources/Plasma/Apps/plClient/plClient.cpp @@ -1436,10 +1436,6 @@ bool plClient::StartInit() plgAudioSys::Activate(true); - IPlayIntroMovie("avi/CyanWorlds.avi", 0.f, 0.f, 0.f, 1.f, 1.f, 0.75); - if( GetDone() ) return false; - plgDispatch::Dispatch()->RegisterForExactType(plMovieMsg::Index(), GetKey()); - // // Init Net before loading things // @@ -1453,7 +1449,7 @@ bool plClient::StartInit() pModMsg2->SetCmd(plCmdIfaceModMsg::kAdd); plgDispatch::MsgSend(pModMsg2); - // create new the virtual camera + // create new virtual camera fNewCamera = new plVirtualCam1; fNewCamera->RegisterAs( kVirtualCamera1_KEY ); fNewCamera->Init(); @@ -1464,6 +1460,10 @@ bool plClient::StartInit() plMouseDevice::Instance()->SetDisplayResolution((float)fPipeline->Width(), (float)fPipeline->Height()); plInputManager::SetRecenterMouse(false); + IPlayIntroMovie("avi/CyanWorlds.webm", 0.f, 0.f, 0.f, 1.f, 1.f, 0.75); + if(GetDone()) return false; + plgDispatch::Dispatch()->RegisterForExactType(plMovieMsg::Index(), GetKey()); + // create the listener for the audio system: plListener* pLMod = new plListener; pLMod->RegisterAs(kListenerMod_KEY ); diff --git a/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.h b/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.h index fc407ed2..5fab5160 100644 --- a/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.h +++ b/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.h @@ -129,7 +129,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // tint=yes/no - Defines whether or not this decal is tinted // // with the cover. Overridden by the tintfirst // // option on the tag. Defaults to no // -// - Places a movie (.avi file) inline with the text. Options: // +// - Places a movie (.webm file) inline with the text. Options:// // src= - Selects the movie to be used. (nead search // // methods here eventually) // // align=left/right/center // diff --git a/Sources/Plasma/PubUtilLib/plMessage/plMovieMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plMovieMsg.h index bdd213e7..a85b19b7 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plMovieMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plMovieMsg.h @@ -155,7 +155,7 @@ public: plMovieMsg& SetScaleX(float x) { fScale.fX = x; return *this; } plMovieMsg& SetScaleY(float y) { fScale.fY = y; return *this; } - // Include the movie folder, e.g. "avi/movie.avi" + // Include the movie folder, e.g. "avi/movie.webm" // String is copied, not pointer copy. plString GetFileName() const { return fFileName; } plMovieMsg& SetFileName(const plString& name) { fFileName = name; return *this; }