From: Xordan <mg...@us...> - 2007-09-02 23:55:10
|
Update of /cvsroot/planeshift/planeshift/src/common/engine In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4707 Modified Files: psworld.cpp Log Message: - Deprecation fixes. Index: psworld.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/common/engine/psworld.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** psworld.cpp 24 Jun 2007 09:46:05 -0000 1.17 --- psworld.cpp 2 Sep 2007 23:55:10 -0000 1.18 *************** *** 31,35 **** #include <cstool/collider.h> #include <ivaria/collider.h> ! #include <igeom/polymesh.h> #include <imesh/objmodel.h> #include <iengine/mesh.h> --- 31,35 ---- #include <cstool/collider.h> #include <ivaria/collider.h> ! #include <igeom/trimesh.h> #include <imesh/objmodel.h> #include <iengine/mesh.h> *************** *** 641,645 **** csRef<iObjectIterator> iter = cur_region->QueryObject()->GetIterator(); //return; ! csRef<iPolygonMesh> mesh; iObject *curr; while ( iter->HasNext() ) --- 641,645 ---- csRef<iObjectIterator> iter = cur_region->QueryObject()->GetIterator(); //return; ! csRef<iTriangleMesh> mesh; iObject *curr; while ( iter->HasNext() ) *************** *** 650,654 **** if (sp && sp->GetMeshObject() ) { ! mesh = sp->GetMeshObject()->GetObjectModel()->GetPolygonMeshColldet(); if ( mesh ) --- 650,658 ---- if (sp && sp->GetMeshObject() ) { ! csRef<iStringSet> globalStringSet = csQueryRegistryTagInterface<iStringSet> ( ! object_reg, "crystalspace.shared.stringset"); ! csStringID colldet_id = globalStringSet->Request ("colldet"); ! ! mesh = sp->GetMeshObject()->GetObjectModel()->GetTriangleData(colldet_id); if ( mesh ) |