diff --git a/apps/openmw/mwgui/console.cpp b/apps/openmw/mwgui/console.cpp index 07905bcb9..836a0f0db 100644 --- a/apps/openmw/mwgui/console.cpp +++ b/apps/openmw/mwgui/console.cpp @@ -28,12 +28,6 @@ namespace MWGui bool Console::compile (const std::string& cmd, Compiler::Output& output) { - - listNames(); - for (std::vector::iterator iter (mNames.begin()); iter!=mNames.end(); ++iter) - std::cout << *iter << ", "; - std::cout << std::endl; - try { ErrorHandler::reset(); diff --git a/apps/openmw/mwrender/mwscene.cpp b/apps/openmw/mwrender/mwscene.cpp index b562e19ee..6fab00850 100644 --- a/apps/openmw/mwrender/mwscene.cpp +++ b/apps/openmw/mwrender/mwscene.cpp @@ -155,6 +155,7 @@ void MWScene::addActor (const std::string& handle, const std::string& mesh, void MWScene::removeObject (const std::string& handle) { //TODO:check if actor??? + eng->removeCharacter(handle); eng->removeRigidBody(handle); eng->deleteRigidBody(handle); } diff --git a/apps/openmw/mwworld/world.cpp b/apps/openmw/mwworld/world.cpp index 8e3acab7f..10117d853 100644 --- a/apps/openmw/mwworld/world.cpp +++ b/apps/openmw/mwworld/world.cpp @@ -453,8 +453,6 @@ namespace MWWorld delete mPlayer; delete mSkyManager; delete mGlobalVariables; - - //delete mPhysEngine; } MWWorld::Player& World::getPlayer() diff --git a/components/nifbullet/bullet_nif_loader.cpp b/components/nifbullet/bullet_nif_loader.cpp index 301060cd6..b3fd9019c 100644 --- a/components/nifbullet/bullet_nif_loader.cpp +++ b/components/nifbullet/bullet_nif_loader.cpp @@ -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(cShape->collide == false) { - std::cout << "collide = false "<addChildShape(tr,NodeShape); - std::cout << "tri"; } void ManualBulletShapeLoader::load(const std::string &name,const std::string &group) diff --git a/libs/openengine b/libs/openengine index 1ce6405e2..32b475432 160000 --- a/libs/openengine +++ b/libs/openengine @@ -1 +1 @@ -Subproject commit 1ce6405e2bf5388a05a5cc0a60d1c5fe3dcadbfb +Subproject commit 32b475432f3e1c8d7275d17da0d692c173f30478