mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 19:45:34 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'cc9cii/master'

Browse source
This commit is contained in:
Marc Zinnschlag 2014-10-25 12:07:07 +02:00
commit 4678d26c22
4 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/openmw/mwgui/formatting.hpp
View file

@ -132,6 +132,7 @@ namespace MWGui
virtual int pageSplit();
protected:
virtual ~GraphicElement() {}
MyGUI::Widget * mParent;
Paginator & mPaginator;
BlockStyle mBlockStyle;

1
cmake/FindOGRE.cmake
View file

@ -382,7 +382,6 @@ endmacro()
ogre_find_component(Paging OgrePaging.h)
# look for Overlay component
ogre_find_component(Overlay OgreOverlaySystem.h)
ogre_find_component(Overlay OgreOverlay.h)
# look for Terrain component
ogre_find_component(Terrain OgreTerrain.h)
# look for Property component

1
extern/ogre-ffmpeg-videoplayer/videoplayer.cpp vendored
View file

@ -1,5 +1,6 @@
#include "videoplayer.hpp"
#include "audiofactory.hpp"
#include "videostate.hpp"
namespace Video

2
extern/ogre-ffmpeg-videoplayer/videostate.cpp vendored
View file

@ -221,7 +221,7 @@ void VideoState::video_refresh()
}
else
{
const float threshold = 0.03;
const float threshold = 0.03f;
if (this->pictq[pictq_rindex].pts > this->get_master_clock() + threshold)
return; // not ready yet to show this picture