mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-21 09:53:50 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Nikolay Kasyanov 2011-03-24 14:26:49 +03:00
commit db34640d75
5 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwgui/console.cpp
View file

@ -28,12 +28,6 @@ namespace MWGui
bool Console::compile (const std::string& cmd, Compiler::Output& output) bool Console::compile (const std::string& cmd, Compiler::Output& output)
{ {
listNames();
for (std::vector<std::string>::iterator iter (mNames.begin()); iter!=mNames.end(); ++iter)
std::cout << *iter << ", ";
std::cout << std::endl;
try try
{ {
ErrorHandler::reset(); ErrorHandler::reset();

1
apps/openmw/mwrender/mwscene.cpp
View file

@ -155,6 +155,7 @@ void MWScene::addActor (const std::string& handle, const std::string& mesh,
void MWScene::removeObject (const std::string& handle) void MWScene::removeObject (const std::string& handle)
{ {
//TODO:check if actor??? //TODO:check if actor???
eng->removeCharacter(handle);
eng->removeRigidBody(handle); eng->removeRigidBody(handle);
eng->deleteRigidBody(handle); eng->deleteRigidBody(handle);
} }

2
apps/openmw/mwworld/world.cpp
View file

@ -453,8 +453,6 @@ namespace MWWorld
delete mPlayer; delete mPlayer;
delete mSkyManager; delete mSkyManager;
delete mGlobalVariables; delete mGlobalVariables;
//delete mPhysEngine;
} }
MWWorld::Player& World::getPlayer() MWWorld::Player& World::getPlayer()

2
components/nifbullet/bullet_nif_loader.cpp
View file

@ -133,7 +133,6 @@ void ManualBulletShapeLoader::loadResource(Ogre::Resource *resource)
//if collide = false, then it does a second pass which create a shape for raycasting. //if collide = false, then it does a second pass which create a shape for raycasting.
if(cShape->collide == false) if(cShape->collide == false)
{ {
std::cout << "collide = false "<<resourceName << std::endl;
handleNode(node,0,Ogre::Matrix3::IDENTITY,Ogre::Vector3::ZERO,1,hasCollisionNode,false,true); handleNode(node,0,Ogre::Matrix3::IDENTITY,Ogre::Vector3::ZERO,1,hasCollisionNode,false,true);
} }
} }
@ -306,7 +305,6 @@ void ManualBulletShapeLoader::handleNiTriShape(Nif::NiTriShape *shape, int flags
} }
NodeShape = new btBvhTriangleMeshShape(mTriMesh,true); NodeShape = new btBvhTriangleMeshShape(mTriMesh,true);
currentShape->addChildShape(tr,NodeShape); currentShape->addChildShape(tr,NodeShape);
std::cout << "tri";
} }
void ManualBulletShapeLoader::load(const std::string &name,const std::string &group) void ManualBulletShapeLoader::load(const std::string &name,const std::string &group)

2
libs/openengine

@ -1 +1 @@
Subproject commit 1ce6405e2bf5388a05a5cc0a60d1c5fe3dcadbfb Subproject commit 32b475432f3e1c8d7275d17da0d692c173f30478