--- trunk/src/brains/SimCreator.cpp	2005/01/12 22:41:40	246
+++ trunk/src/brains/SimCreator.cpp	2005/02/04 05:26:30	285
@@ -116,6 +116,10 @@ SimInfo*  SimCreator::createSim(const std::string & md
         simError();
     }
 
+    if (simParams->haveForceFieldFileName()) {
+        ff->setForceFieldFileName(simParams->getForceFieldFileName());
+    }
+    
     std::string forcefieldFileName;
     forcefieldFileName = ff->getForceFieldFileName();
 
@@ -547,6 +551,8 @@ void SimCreator::setGlobalIndex(SimInfo *info) {
         beginCutoffGroupIndex += NumCutoffGroupsInProc[i];
     }
 
+    //rigidbody's index begins right after atom's
+    beginRigidBodyIndex += info->getNGlobalAtoms();
 #endif
 
     for(mol = info->beginMolecule(mi); mol != NULL;