Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Rename CSheets in GPM to CGpmSheets

Browse source
This commit is contained in:
kaetemi 2014-02-18 22:43:06 +01:00
parent 116e3440c8
commit 44351644f1
5 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/ryzom/server/src/gpm_service/gpm_service.cpp
View file

@ -298,7 +298,7 @@ void CGlobalPositionManagerService::init()
GET_VAR_FROM_CF(LoadPacsPrims, true);
CSheets::init();
CGpmSheets::init();
// World Position Manager init
if (!IsRingShard)
@ -707,7 +707,7 @@ void CGlobalPositionManagerService::release()
CWorldPositionManager::release();
}
CSheets::release();
CGpmSheets::release();
}// release //

14
code/ryzom/server/src/gpm_service/sheets.cpp
View file

@ -45,14 +45,14 @@ using namespace NLGEORGES;
//-------------------------------------------------------------------------
// the singleton data
std::map<CSheetId,CSheets::CSheet> CSheets::_sheets;
bool CSheets::_initialised=false;
std::map<CSheetId,CGpmSheets::CSheet> CGpmSheets::_sheets;
bool CGpmSheets::_initialised=false;
//-------------------------------------------------------------------------
// init
void CSheets::init()
void CGpmSheets::init()
{
if (_initialised)
return;
@ -72,11 +72,11 @@ void CSheets::init()
//-------------------------------------------------------------------------
// display
void CSheets::display()
void CGpmSheets::display()
{
nlassert(_initialised);
std::map<CSheetId,CSheets::CSheet>::iterator it;
std::map<CSheetId,CGpmSheets::CSheet>::iterator it;
for(it=_sheets.begin();it!=_sheets.end();++it)
{
nlinfo("SHEET:%s Walk:%f Run:%f Radius:%f Height:%f Bounding:%f Scale:%f",(*it).first.toString().c_str(),
@ -88,12 +88,12 @@ void CSheets::display()
//-------------------------------------------------------------------------
// lookup
const CSheets::CSheet *CSheets::lookup( CSheetId id )
const CGpmSheets::CSheet *CGpmSheets::lookup( CSheetId id )
{
nlassert(_initialised);
// setup an iterator and lookup the sheet id in the map
std::map<CSheetId,CSheets::CSheet>::iterator it;
std::map<CSheetId,CGpmSheets::CSheet>::iterator it;
it=_sheets.find(id);
// if we found a valid entry return a pointer to the creature record otherwise 0

4
code/ryzom/server/src/gpm_service/sheets.h
View file

@ -34,7 +34,7 @@
* \author Nevrax France
* \date 2002
*/
class CSheets
class CGpmSheets
{
public:
class CSheet
@ -85,7 +85,7 @@ public:
private:
// prohibit cnstructor as this is a singleton
CSheets();
CGpmSheets();
static std::map<NLMISC::CSheetId,CSheet> _sheets;
static bool _initialised;

2
code/ryzom/server/src/gpm_service/world_entity.cpp
View file

@ -309,7 +309,7 @@ void CWorldEntity::createPrimitive(NLPACS::UMoveContainer *pMoveContainer, uint8
Primitive = NULL;
MoveContainer = NULL;
const CSheets::CSheet *sheet = CSheets::lookup(CSheetId(Sheet()));
const CGpmSheets::CSheet *sheet = CGpmSheets::lookup(CSheetId(Sheet()));
float primRadius = 0.5f;
float primHeight = 2.0f;

2
code/ryzom/tools/sheets_packer_shard/sheets_packer_shard.cpp
View file

@ -113,7 +113,7 @@ int main(int nNbArg, char **ppArgs)
// GPMS
{
std::map<NLMISC::CSheetId, CSheets::CSheet> container;
std::map<NLMISC::CSheetId, CGpmSheets::CSheet> container;
std::vector<std::string> filters;
filters.push_back("creature");
filters.push_back("player");