[Planeshift-cvs] CVS: planeshift/src/common/psbehave psworld.cpp,1.37,1.38

[Ondrej H. <tan...@us...>]

Update of /cvsroot/planeshift/planeshift/src/common/psbehave
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30243/src/common/psbehave

Modified Files:
	psworld.cpp 
Log Message:
- Map loading: materials and textures are now removed from the iRegion
  they resided in, after assigning them to the special region that holds
  all materials and textures.


Index: psworld.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/psbehave/psworld.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** psworld.cpp	5 Jul 2004 02:16:15 -0000	1.37
--- psworld.cpp	10 Jul 2004 02:17:53 -0000	1.38
***************
*** 101,106 ****
          if (source->IsInRegion(obj))
          {
- //            source->Remove(obj);
              materialRegion->Add(obj);
          }
      }
--- 101,106 ----
          if (source->IsInRegion(obj))
          {
              materialRegion->Add(obj);
+             source->Remove(obj);
          }
      }
***************
*** 111,116 ****
          if (source->IsInRegion(obj))
          {
- //            source->Remove(obj);
              materialRegion->Add(obj);
          }
      }
--- 111,116 ----
          if (source->IsInRegion(obj))
          {
              materialRegion->Add(obj);
+             source->Remove(obj);
          }
      }
***************
*** 349,357 ****
  printf ("After LoadMapFile: time=%d\n", csGetTicks ());
  
-     world->MoveToMaterialRegion(cur_region);
- 
      // Successfully loaded.  Now get textures ready, etc. and return.
      cur_region->Prepare ();
  
  printf ("After cur_region->Prepare: time=%d\n", csGetTicks ());
      SetupWorldColliders(engine,cur_region);
--- 349,357 ----
  printf ("After LoadMapFile: time=%d\n", csGetTicks ());
  
      // Successfully loaded.  Now get textures ready, etc. and return.
      cur_region->Prepare ();
  
+     world->MoveToMaterialRegion(cur_region);
+ 
  printf ("After cur_region->Prepare: time=%d\n", csGetTicks ());
      SetupWorldColliders(engine,cur_region);
***************
*** 394,398 ****
  
      csRef<iObjectIterator> iter = cur_region->QueryObject()->GetIterator();
! 
      csRef<iPolygonMesh> mesh;
      iObject *curr;
--- 394,398 ----
  
      csRef<iObjectIterator> iter = cur_region->QueryObject()->GetIterator();
! //return;
      csRef<iPolygonMesh> mesh;
      iObject *curr;