From: Xordan <mg...@us...> - 2006-11-28 18:39:34
|
Update of /cvsroot/planeshift/planeshift/src/server/bulkobjects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22457/src/server/bulkobjects Modified Files: psnpcloader.cpp Log Message: - Replaced all depreciated SCF_QUERY_INTERFACE/CS_QUERY_REGISTRY/CS_QUERY_REGISTRY_TAG_INTERFACE with scfQueryInterface<>/csQueryRegistry<>/csQueryRegistryTagInterface<> respectively. Index: psnpcloader.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/psnpcloader.cpp,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** psnpcloader.cpp 27 Nov 2006 00:24:26 -0000 1.65 --- psnpcloader.cpp 28 Nov 2006 18:39:23 -0000 1.66 *************** *** 57,61 **** // try to read data from the file ! csRef<iVFS> vfs = CS_QUERY_REGISTRY(psserver->GetObjectReg(), iVFS); csRef<iDataBuffer> data(vfs->ReadFile (filename.GetData())); if (!data || !data->GetSize()) --- 57,61 ---- // try to read data from the file ! csRef<iVFS> vfs = csQueryRegistry<iVFS> (psserver->GetObjectReg()); csRef<iDataBuffer> data(vfs->ReadFile (filename.GetData())); if (!data || !data->GetSize()) *************** *** 148,152 **** // try to read data from the file ! csRef<iVFS> vfs = CS_QUERY_REGISTRY(psserver->GetObjectReg(), iVFS); csRef<iDataBuffer> data = vfs->ReadFile (filename.GetData()); if (!data || !data->GetSize()) --- 148,152 ---- // try to read data from the file ! csRef<iVFS> vfs = csQueryRegistry<iVFS> (psserver->GetObjectReg()); csRef<iDataBuffer> data = vfs->ReadFile (filename.GetData()); if (!data || !data->GetSize()) *************** *** 855,859 **** WriteSpecificKnowledge(); ! csRef<iVFS> vfs = CS_QUERY_REGISTRY(psserver->GetObjectReg(), iVFS); if (!vfs) --- 855,859 ---- WriteSpecificKnowledge(); ! csRef<iVFS> vfs = csQueryRegistry<iVFS> (psserver->GetObjectReg()); if (!vfs) *************** *** 944,948 **** } ! csRef<iVFS> vfs = CS_QUERY_REGISTRY(psserver->GetObjectReg(), iVFS); if (!vfs) --- 944,948 ---- } ! csRef<iVFS> vfs = csQueryRegistry<iVFS> (psserver->GetObjectReg()); if (!vfs) |