OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 19:29:09 +00:00
Code Releases Activity

Delay intro movie playback until after display init.

Browse Source 
- Fixes stretched cursor during movie playback.
This commit is contained in:
Joseph Davies
2013-02-15 07:30:08 -08:00
committed by Florian Meißner
parent 2caade5fff
commit cbcbdc0889
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Sources/Plasma/Apps/plClient/plClient.cpp
View File

@ -1436,10 +1436,6 @@ bool plClient::StartInit()
plgAudioSys::Activate(true); 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 // Init Net before loading things
// //
@ -1453,7 +1449,7 @@ bool plClient::StartInit()
pModMsg2->SetCmd(plCmdIfaceModMsg::kAdd); pModMsg2->SetCmd(plCmdIfaceModMsg::kAdd);
plgDispatch::MsgSend(pModMsg2); plgDispatch::MsgSend(pModMsg2);
// create new the virtual camera // create new virtual camera
fNewCamera = new plVirtualCam1; fNewCamera = new plVirtualCam1;
fNewCamera->RegisterAs( kVirtualCamera1_KEY ); fNewCamera->RegisterAs( kVirtualCamera1_KEY );
fNewCamera->Init(); fNewCamera->Init();
@ -1464,6 +1460,10 @@ bool plClient::StartInit()
plMouseDevice::Instance()->SetDisplayResolution((float)fPipeline->Width(), (float)fPipeline->Height()); plMouseDevice::Instance()->SetDisplayResolution((float)fPipeline->Width(), (float)fPipeline->Height());
plInputManager::SetRecenterMouse(false); 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: // create the listener for the audio system:
plListener* pLMod = new plListener; plListener* pLMod = new plListener;
pLMod->RegisterAs(kListenerMod_KEY ); pLMod->RegisterAs(kListenerMod_KEY );

2
Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.h
View File

@ -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 // // tint=yes/no - Defines whether or not this decal is tinted //
// with the cover. Overridden by the tintfirst // // with the cover. Overridden by the tintfirst //
// option on the <cover> tag. Defaults to no // // option on the <cover> tag. Defaults to no //
// <movie> - Places a movie (.avi file) inline with the text. Options: // // <movie> - Places a movie (.webm file) inline with the text. Options://
// src=<movie name> - Selects the movie to be used. (nead search // // src=<movie name> - Selects the movie to be used. (nead search //
// methods here eventually) // // methods here eventually) //
// align=left/right/center // // align=left/right/center //

2
Sources/Plasma/PubUtilLib/plMessage/plMovieMsg.h
View File

@ -155,7 +155,7 @@ public:
plMovieMsg& SetScaleX(float x) { fScale.fX = x; return *this; } plMovieMsg& SetScaleX(float x) { fScale.fX = x; return *this; }
plMovieMsg& SetScaleY(float y) { fScale.fY = y; 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. // String is copied, not pointer copy.
plString GetFileName() const { return fFileName; } plString GetFileName() const { return fFileName; }
plMovieMsg& SetFileName(const plString& name) { fFileName = name; return *this; } plMovieMsg& SetFileName(const plString& name) { fFileName = name; return *this; }