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

COMPOSER: Completely removed unnecessary #ifdefs

Browse source
This commit is contained in:
upthorn 2012-06-12 15:19:25 -07:00 • committed by angstsmurf
parent 027bab88fb
commit c4c6cce78e
8 changed files with 3 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

16
engines/composer/detection.cpp
View file

@ -21,11 +21,9 @@
*/
#include "base/plugins.h"
#ifdef SAVING_ANYWHERE
#include "common/savefile.h"
#include "common/serializer.h"
#include "common/str-array.h"
#endif // SAVING_ANYWHERE
#include "engines/advancedDetector.h"
#include "composer/composer.h"
@ -466,14 +464,9 @@ bool ComposerMetaEngine::createInstance(OSystem *syst, Engine **engine, const AD
}
bool ComposerMetaEngine::hasFeature(MetaEngineFeature f) const {
#ifdef SAVING_ANYWHERE
return (f == kSupportsListSaves);
#else
return false;
#endif // SAVING_ANYWHERE
return (f == kSupportsListSaves);
}
#ifdef SAVING_ANYWHERE
Common::String getSaveName(Common::InSaveFile *in) {
Common::Serializer ser(in, NULL);
Common::String name;
@ -512,14 +505,11 @@ SaveStateList ComposerMetaEngine::listSaves(const char *target) const {
return saveList;
}
#endif // SAVING_ANYWHERE
bool Composer::ComposerEngine::hasFeature(EngineFeature f) const {
return (f == kSupportsRTL
#ifdef SAVING_ANYWHERE
|| f == kSupportsSavingDuringRuntime || f == kSupportsLoadingDuringRuntime
#endif // SAVING_ANYWHERE
);
|| f == kSupportsSavingDuringRuntime
|| f == kSupportsLoadingDuringRuntime);
}
#if PLUGIN_ENABLED_DYNAMIC(COMPOSER)