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

ALL: Fix warnings when building with Apple's CLang

Browse source
This commit is contained in:
Bastien Bouclet 2016-06-14 08:24:02 +02:00
parent d4ce2d8c50
commit d7b7bad1dc
4 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
engines/stark/services/staticprovider.cpp
View file

@ -32,9 +32,8 @@
namespace Stark { namespace Stark {
StaticProvider::StaticProvider(ArchiveLoader *archiveLoader, Global *global) : StaticProvider::StaticProvider(ArchiveLoader *archiveLoader) :
_archiveLoader(archiveLoader), _archiveLoader(archiveLoader),
_global(global),
_level(nullptr) { _level(nullptr) {
} }

3
engines/stark/services/staticprovider.h
View file

@ -46,7 +46,7 @@ class VisualImageXMG;
*/ */
class StaticProvider { class StaticProvider {
public: public:
StaticProvider(ArchiveLoader *archiveLoader, Global *global); StaticProvider(ArchiveLoader *archiveLoader);
enum UIElement { enum UIElement {
kInventoryScrollUpArrow = 1, kInventoryScrollUpArrow = 1,
@ -90,7 +90,6 @@ public:
private: private:
ArchiveLoader *_archiveLoader; ArchiveLoader *_archiveLoader;
Global *_global;
Resources::Level *_level; Resources::Level *_level;
Common::Array<Resources::Anim *> _stockAnims; Common::Array<Resources::Anim *> _stockAnims;

2
engines/stark/stark.cpp
View file

@ -107,7 +107,7 @@ Common::Error StarkEngine::run() {
_stateProvider = new StateProvider(); _stateProvider = new StateProvider();
_global = new Global(); _global = new Global();
_resourceProvider = new ResourceProvider(_archiveLoader, _stateProvider, _global); _resourceProvider = new ResourceProvider(_archiveLoader, _stateProvider, _global);
_staticProvider = new StaticProvider(_archiveLoader, _global); _staticProvider = new StaticProvider(_archiveLoader);
_randomSource = new Common::RandomSource("stark"); _randomSource = new Common::RandomSource("stark");
_fontProvider = new FontProvider(); _fontProvider = new FontProvider();
_scene = new Scene(_gfx); _scene = new Scene(_gfx);

2
graphics/opengl/surfacerenderer.cpp
View file

@ -174,4 +174,4 @@ ShaderSurfaceRenderer::~ShaderSurfaceRenderer() {
} // End of namespace OpenGL } // End of namespace OpenGL
#endif #endif