mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 18:35:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/zinnschlag/openmw into journal-open-sound

Browse Source
This commit is contained in:
Rohit Nirmal 2013-06-11 21:36:00 -05:00
commit fdeac21f22
6 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/openmw/mwgui/mapwindow.cpp
View File

@ -34,6 +34,10 @@ namespace MWGui
{ {
} }
LocalMapBase::~LocalMapBase()
{
}
void LocalMapBase::init(MyGUI::ScrollView* widget, MyGUI::ImageBox* compass, OEngine::GUI::Layout* layout, bool mapDragAndDrop) void LocalMapBase::init(MyGUI::ScrollView* widget, MyGUI::ImageBox* compass, OEngine::GUI::Layout* layout, bool mapDragAndDrop)
{ {
mLocalMap = widget; mLocalMap = widget;

1
apps/openmw/mwgui/mapwindow.hpp
View File

@ -14,6 +14,7 @@ namespace MWGui
{ {
public: public:
LocalMapBase(); LocalMapBase();
virtual ~LocalMapBase();
void init(MyGUI::ScrollView* widget, MyGUI::ImageBox* compass, OEngine::GUI::Layout* layout, bool mapDragAndDrop=false); void init(MyGUI::ScrollView* widget, MyGUI::ImageBox* compass, OEngine::GUI::Layout* layout, bool mapDragAndDrop=false);
void setCellPrefix(const std::string& prefix); void setCellPrefix(const std::string& prefix);

4
apps/openmw/mwgui/spellcreationdialog.cpp
View File

@ -416,6 +416,10 @@ namespace MWGui
mAddEffectDialog.setVisible (false); mAddEffectDialog.setVisible (false);
} }
EffectEditorBase::~EffectEditorBase()
{
}
void EffectEditorBase::startEditing () void EffectEditorBase::startEditing ()
{ {
// get the list of magic effects that are known to the player // get the list of magic effects that are known to the player

2
apps/openmw/mwgui/spellcreationdialog.hpp
View File

@ -84,7 +84,7 @@ namespace MWGui
{ {
public: public:
EffectEditorBase(); EffectEditorBase();
virtual ~EffectEditorBase();
protected: protected:
std::map<int, short> mButtonMapping; // maps button ID to effect ID std::map<int, short> mButtonMapping; // maps button ID to effect ID

13
apps/openmw/mwrender/videoplayer.cpp
View File

@ -32,9 +32,16 @@ namespace MWRender
extern "C" extern "C"
{ {
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
#include <libavformat/avformat.h> #include <libavformat/avformat.h>
#include <libswscale/swscale.h> #include <libswscale/swscale.h>
// From libavformat version 55.0.100 and onward the declaration of av_gettime() is removed from libavformat/avformat.h and moved
// to libavutil/time.h
// https://github.com/FFmpeg/FFmpeg/commit/06a83505992d5f49846c18507a6c3eb8a47c650e
#if AV_VERSION_INT(55, 0, 100) <= AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, LIBAVFORMAT_VERSION_MINOR, LIBAVFORMAT_VERSION_MICRO)
#include <libavutil/time.h>
#endif
} }
#define MAX_AUDIOQ_SIZE (5 * 16 * 1024) #define MAX_AUDIOQ_SIZE (5 * 16 * 1024)

1
credits.txt
View File

@ -32,6 +32,7 @@ Jacob Essex (Yacoby)
Jannik Heller (scrawl) Jannik Heller (scrawl)
Jason Hooks (jhooks) Jason Hooks (jhooks)
Joel Graff (graffy) Joel Graff (graffy)
John Blomberg (fstp)
Jordan Milne Jordan Milne
Julien Voisin (jvoisin/ap0) Julien Voisin (jvoisin/ap0)
Karl-Felix Glatzer (k1ll) Karl-Felix Glatzer (k1ll)