krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Fix errors and warnings

Browse source
This commit is contained in:
Allofich 2016-09-05 00:49:22 +09:00
parent f49ebee56a
commit 60384399ee
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwmechanics/spellcasting.cpp
View file

@ -2,6 +2,7 @@
#include <cfloat> #include <cfloat>
#include <limits> #include <limits>
#include <stdio.h>
#include <boost/format.hpp> #include <boost/format.hpp>
@ -341,7 +342,7 @@ namespace MWMechanics
std::vector<std::string>::iterator it; std::vector<std::string>::iterator it;
it = projectileIDs.begin(); it = projectileIDs.begin();
char numstr[8]; char numstr[8];
sprintf(numstr, "%zd", (effects.mList.size())); sprintf(numstr, "%d", (int)(effects.mList.size()));
std::string ID = "VFX_Multiple"; std::string ID = "VFX_Multiple";
ID = ID + numstr; ID = ID + numstr;
it = projectileIDs.insert(it, ID); it = projectileIDs.insert(it, ID);

6
apps/openmw/mwworld/projectilemanager.cpp
View file

@ -1,5 +1,7 @@
#include "projectilemanager.hpp" #include "projectilemanager.hpp"
#include <stdio.h>
#include <osg/PositionAttitudeTransform> #include <osg/PositionAttitudeTransform>
#include <components/esm/esmwriter.hpp> #include <components/esm/esmwriter.hpp>
@ -92,13 +94,13 @@ namespace MWWorld
attachTo = rotateNode; attachTo = rotateNode;
} }
mResourceSystem->getSceneManager()->getInstance(model, attachTo); osg::ref_ptr<osg::Node> ptr = mResourceSystem->getSceneManager()->getInstance(model, attachTo);
if (state.mIdMagic.size() > 1) if (state.mIdMagic.size() > 1)
for (size_t iter = 1; iter != state.mIdMagic.size(); ++iter) for (size_t iter = 1; iter != state.mIdMagic.size(); ++iter)
{ {
char numstr[8]; char numstr[8];
sprintf(numstr, "%zd", iter); sprintf(numstr, "%d", (int)iter);
std::string node = "Dummy0"; std::string node = "Dummy0";
node = node + numstr; node = node + numstr;
const ESM::Weapon* weapon = MWBase::Environment::get().getWorld()->getStore().get<ESM::Weapon>().find (state.mIdMagic.at(iter)); const ESM::Weapon* weapon = MWBase::Environment::get().getWorld()->getStore().get<ESM::Weapon>().find (state.mIdMagic.at(iter));