From 60384399eed24f86426e1d96159f1ebebc29ab9a Mon Sep 17 00:00:00 2001 From: Allofich Date: Mon, 5 Sep 2016 00:49:22 +0900 Subject: [PATCH] Fix errors and warnings --- apps/openmw/mwmechanics/spellcasting.cpp | 3 ++- apps/openmw/mwworld/projectilemanager.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp index 654e4b51b9..1b2fbfdc83 100644 --- a/apps/openmw/mwmechanics/spellcasting.cpp +++ b/apps/openmw/mwmechanics/spellcasting.cpp @@ -2,6 +2,7 @@ #include #include +#include #include @@ -341,7 +342,7 @@ namespace MWMechanics std::vector::iterator it; it = projectileIDs.begin(); char numstr[8]; - sprintf(numstr, "%zd", (effects.mList.size())); + sprintf(numstr, "%d", (int)(effects.mList.size())); std::string ID = "VFX_Multiple"; ID = ID + numstr; it = projectileIDs.insert(it, ID); diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp index f5d229f09f..a7b4be9c96 100644 --- a/apps/openmw/mwworld/projectilemanager.cpp +++ b/apps/openmw/mwworld/projectilemanager.cpp @@ -1,5 +1,7 @@ #include "projectilemanager.hpp" +#include + #include #include @@ -92,13 +94,13 @@ namespace MWWorld attachTo = rotateNode; } - mResourceSystem->getSceneManager()->getInstance(model, attachTo); + osg::ref_ptr ptr = mResourceSystem->getSceneManager()->getInstance(model, attachTo); if (state.mIdMagic.size() > 1) for (size_t iter = 1; iter != state.mIdMagic.size(); ++iter) { char numstr[8]; - sprintf(numstr, "%zd", iter); + sprintf(numstr, "%d", (int)iter); std::string node = "Dummy0"; node = node + numstr; const ESM::Weapon* weapon = MWBase::Environment::get().getWorld()->getStore().get().find (state.mIdMagic.at(iter));