thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into soltys_wip2

Browse source
This commit is contained in:
Alyssa Milburn 2011-07-07 09:24:10 +02:00
commit 66e81d633f
142 changed files with 3558 additions and 2509 deletions
Download patch file Download diff file Expand all files Collapse all files

4
base/plugins.cpp
View file

@ -543,7 +543,9 @@ void PluginManager::addToPluginsInMemList(Plugin *plugin) {
#include "engines/metaengine.h"
namespace Common {
DECLARE_SINGLETON(EngineManager);
}
/**
* This function works for both cached and uncached PluginManagers.
@ -634,7 +636,9 @@ const EnginePlugin::List &EngineManager::getPlugins() const {
#include "audio/musicplugin.h"
namespace Common {
DECLARE_SINGLETON(MusicManager);
}
const MusicPlugin::List &MusicManager::getPlugins() const {
return (const MusicPlugin::List &)PluginManager::instance().getPlugins(PLUGIN_TYPE_MUSIC);