mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-22 12:39:41 +00:00
Code Issues Releases Wiki Activity

cmake fix; silenced some warnings

Browse source
This commit is contained in:
Marc Zinnschlag 2012-07-10 13:23:41 +02:00
parent 164a5c8fe4
commit f11bf49a90
3 changed files with 24 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/CMakeLists.txt
View file

@ -39,7 +39,7 @@ add_openmw_dir (mwscript
locals scriptmanager compilercontext interpretercontext cellextensions miscextensions locals scriptmanager compilercontext interpretercontext cellextensions miscextensions
guiextensions soundextensions skyextensions statsextensions containerextensions guiextensions soundextensions skyextensions statsextensions containerextensions
aiextensions controlextensions extensions globalscripts ref dialogueextensions aiextensions controlextensions extensions globalscripts ref dialogueextensions
animationextensions animationextensions transformationextensions
) )
add_openmw_dir (mwsound add_openmw_dir (mwsound

1
apps/openmw/mwworld/physicssystem.cpp
View file

@ -165,7 +165,6 @@ namespace MWWorld
for (std::vector<std::pair<std::string, Ogre::Vector3> >::const_iterator iter (actors.begin()); for (std::vector<std::pair<std::string, Ogre::Vector3> >::const_iterator iter (actors.begin());
iter!=actors.end(); ++iter) iter!=actors.end(); ++iter)
{ {
OEngine::Physic::PhysicActor* act = mEngine->getCharacter(iter->first);
//dirty stuff to get the camera orientation. Must be changed! //dirty stuff to get the camera orientation. Must be changed!
Ogre::SceneNode *sceneNode = mRender.getScene()->getSceneNode (iter->first); Ogre::SceneNode *sceneNode = mRender.getScene()->getSceneNode (iter->first);

20
components/nifbullet/bullet_nif_loader.cpp
View file

@ -82,17 +82,17 @@ static void vectorMulAdd(const Matrix &A, const Vector &B, float *C, float scale
} }
// Computes B = AxB (matrix*vector) // Computes B = AxB (matrix*vector)
static void vectorMul(const Matrix &A, float *C) //static void vectorMul(const Matrix &A, float *C)
{ //{
// Keep the original values // // Keep the original values
float a = C[0]; // float a = C[0];
float b = C[1]; // float b = C[1];
float c = C[2]; // float c = C[2];
// Perform matrix multiplication, scaling and addition // // Perform matrix multiplication, scaling and addition
for (int i=0;i<3;i++) // for (int i=0;i<3;i++)
C[i] = a*A.v[i].array[0] + b*A.v[i].array[1] + c*A.v[i].array[2]; // C[i] = a*A.v[i].array[0] + b*A.v[i].array[1] + c*A.v[i].array[2];
} //}
ManualBulletShapeLoader::~ManualBulletShapeLoader() ManualBulletShapeLoader::~ManualBulletShapeLoader()