[PlaneShift-svn] SF.net SVN: planeshift:[7321] trunk/src/npcclient/npcclient.cpp

[<wel...@us...>]

Revision: 7321
          http://planeshift.svn.sourceforge.net/planeshift/?rev=7321&view=rev
Author:   weltall2
Date:     2011-05-24 21:32:53 +0000 (Tue, 24 May 2011)

Log Message:
-----------
Now the npc which failed to load iterate again to see if they can be loaded after others

Modified Paths:
--------------
    trunk/src/npcclient/npcclient.cpp

Modified: trunk/src/npcclient/npcclient.cpp
===================================================================
--- trunk/src/npcclient/npcclient.cpp	2011-05-24 21:08:16 UTC (rev 7320)
+++ trunk/src/npcclient/npcclient.cpp	2011-05-24 21:32:53 UTC (rev 7321)
@@ -439,6 +439,7 @@
 
 bool psNPCClient::LoadNPCTypes()
 {
+    csArray<unsigned long> postponedNPCTypeID;
     Result rs(db->Select("SELECT * from sc_npctypes ORDER BY id"));
 
     if (!rs.IsValid() || !(rs.Count() >= 1))
@@ -465,10 +466,36 @@
         else
         {
             delete npctype;
-            return false;
+            //we keep these for a more deep inspection
+            postponedNPCTypeID.Push(i);
         }
     }
-    return true;
+
+    size_t lastSize = 0;
+    //try reloading all the failures till the size of failed ones changes and it's > 0
+    //as soon as one iteration didn't load anything we will exit with failure
+    while(postponedNPCTypeID.GetSize() != 0 && lastSize != postponedNPCTypeID.GetSize())
+    {
+        lastSize = postponedNPCTypeID.GetSize(); //keep the starting amount of items
+        for(size_t y = 0; y < postponedNPCTypeID.GetSize(); y++)
+        {
+            //maybe we should reorder them by dependency? the issue with that is that
+            //we would need to know more about the items inner working.
+            NPCType *npctype = new NPCType(this, eventmanager);
+            if(npctype->Load(rs[postponedNPCTypeID.Get(y)]))
+            {
+                npctypes.Put(npctype->GetName(), npctype);
+                postponedNPCTypeID.DeleteIndex(y);
+                y--;
+            }
+            else
+            {
+                delete npctype;
+            }
+        }
+    }
+    //success only if the array is empty at this point, else failure.
+    return postponedNPCTypeID.IsEmpty();
 }
     
 


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