From: Andrew C. <ac...@us...> - 2003-04-26 04:12:46
|
Update of /cvsroot/planeshift/planeshift/src/common/util In directory sc8-pr-cvs1:/tmp/cvs-serv12875/common/util Modified Files: psresmngr.cpp Log Message: Fixed for hash map changes in CS. Index: psresmngr.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/common/util/psresmngr.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** psresmngr.cpp 24 Mar 2003 04:44:53 -0000 1.4 --- psresmngr.cpp 26 Apr 2003 04:12:43 -0000 1.5 *************** *** 15,24 **** if (p_resources) { ! csHashIterator i(p_resources); bool head=false; psTemplateRes* res; ! while ( (res = (psTemplateRes*) i.Next()) ) { if (res->GetRefCount() != 1) { --- 15,25 ---- if (p_resources) { ! csGlobalHashIterator i(p_resources); bool head=false; psTemplateRes* res; ! while ( i.HasNext() ) { + res = (psTemplateRes*) i.Next(); if (res->GetRefCount() != 1) { *************** *** 46,51 **** csHashIterator i(p_resources, key); psTemplateRes* res; ! while ( (res = (psTemplateRes*) i.Next()) ) { if (!strcmp(res->GetName(), name)) return res; --- 47,53 ---- csHashIterator i(p_resources, key); psTemplateRes* res; ! while ( i.HasNext() ) { + res = (psTemplateRes*) i.Next(); if (!strcmp(res->GetName(), name)) return res; *************** *** 83,92 **** if (p_resources) { ! csHashIterator i(p_resources); csHashMap *p_newresources=new csHashMap; psTemplateRes* res; ! while ( (res = (psTemplateRes*) i.Next()) ) { if (res->GetRefCount() != 1) { --- 85,95 ---- if (p_resources) { ! csGlobalHashIterator i(p_resources); csHashMap *p_newresources=new csHashMap; psTemplateRes* res; ! while ( i.HasNext() ) { + res = (psTemplateRes*) i.Next(); if (res->GetRefCount() != 1) { |