[PlaneShift-svn] SF.net SVN: planeshift:[5174] trunk/src/eedit/eeditapp.cpp

[<mg...@us...>]

Revision: 5174
          http://planeshift.svn.sourceforge.net/planeshift/?rev=5174&view=rev
Author:   mgist
Date:     2010-01-08 22:22:43 +0000 (Fri, 08 Jan 2010)

Log Message:
-----------
- Added missing loading loop to eedit.

Modified Paths:
--------------
    trunk/src/eedit/eeditapp.cpp

Modified: trunk/src/eedit/eeditapp.cpp
===================================================================
--- trunk/src/eedit/eeditapp.cpp	2010-01-08 21:51:55 UTC (rev 5173)
+++ trunk/src/eedit/eeditapp.cpp	2010-01-08 22:22:43 UTC (rev 5174)
@@ -203,10 +203,10 @@
     if (nw)
         nw->SetTitle(WINDOW_CAPTION);
 
-	// loads materials, meshes and maps
+    // loads materials, meshes and maps
     csRef<iBgLoader> loader = csQueryRegistry<iBgLoader>(object_reg);
 
-	loader->PrecacheDataWait("/planeshift/materials/materials.cslib", false);
+    loader->PrecacheDataWait("/planeshift/materials/materials.cslib", false);
 
     csRef<iStringArray> meshes = vfs->FindFiles("/planeshift/meshes/");
     for(size_t j=0; j<meshes->GetSize(); ++j)
@@ -222,13 +222,16 @@
     }
     //CPrintf(CON_CMDOUTPUT,"Loader cache filled");
 
-	csRef<iStringArray> regions;
-	regions.AttachNew(new scfStringArray());
-	regions->Push("npcroom1");
+    csRef<iStringArray> regions;
+    regions.AttachNew(new scfStringArray());
+    regions->Push("npcroom1");
 
-	loader->LoadZones(regions, true);
+    loader->LoadZones(regions, true);
+    while (loader->GetLoadingCount() != 0)
+    {
+        loader->ContinueLoading(true);
+    }
 
-
     // paws initialization
     paws = new PawsManager(object_reg, "/this/art/eedit.zip", NULL, "/this/eedit.cfg");
     if (!paws)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.