RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

plist->p_list

This commit is contained in:
cxgeorge 2001-06-06 01:45:57 +00:00
parent 536a86638f
commit 62aacf0aab
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
panda/src/char/character.cxx
View File

@ -464,15 +464,15 @@ fillin(DatagramIterator& scan, BamReader* manager)
// pointers that this object made to BamReader.
////////////////////////////////////////////////////////////////////
int Character::
complete_pointers(vector_typedWritable &plist, BamReader* manager)
complete_pointers(vector_typedWritable &p_list, BamReader* manager)
{
int start = PartBundleNode::complete_pointers(plist, manager);
_computed_vertices = DCAST(ComputedVertices, plist[start]);
int start = PartBundleNode::complete_pointers(p_list, manager);
_computed_vertices = DCAST(ComputedVertices, p_list[start]);
start++;
int num_parts = _parts.size();
for (int i = 0; i < num_parts; i++) {
_parts[i] = DCAST(PartGroup, plist[start + i]);
_parts[i] = DCAST(PartGroup, p_list[start + i]);
}
start += num_parts;

2
panda/src/char/character.h
View File

@ -99,7 +99,7 @@ private:
public:
static void register_with_read_factory(void);
virtual void write_datagram(BamWriter* manager, Datagram &me);
virtual int complete_pointers(vector_typedWritable &plist,
virtual int complete_pointers(vector_typedWritable &p_list,
BamReader *manager);
static TypedWritable *make_Character(const FactoryParams &params);

12
panda/src/char/characterJoint.cxx
View File

@ -347,36 +347,36 @@ fillin(DatagramIterator& scan, BamReader* manager)
// pointers that this object made to BamReader.
////////////////////////////////////////////////////////////////////
int CharacterJoint::
complete_pointers(vector_typedWritable &plist, BamReader* manager)
complete_pointers(vector_typedWritable &p_list, BamReader* manager)
{
int i;
int start = MovingPartMatrix::complete_pointers(plist, manager);
int start = MovingPartMatrix::complete_pointers(p_list, manager);
int mid = start+_num_net_arcs;
int end = start+_num_net_arcs+_num_local_arcs;
for(i = start; i < mid; i++)
{
if (plist[i] == TypedWritable::Null)
if (p_list[i] == TypedWritable::Null)
{
char_cat->warning() << get_name()
<< " Ignoring null Net NodeRelation" << endl;
}
else
{
add_net_transform(DCAST(NodeRelation, plist[i]));
add_net_transform(DCAST(NodeRelation, p_list[i]));
}
}
for(i = mid; i < end; i++)
{
if (plist[i] == TypedWritable::Null)
if (p_list[i] == TypedWritable::Null)
{
char_cat->warning() << get_name()
<< " Ignoring null Local NodeRelation" << endl;
}
else
{
add_local_transform(DCAST(NodeRelation, plist[i]));
add_local_transform(DCAST(NodeRelation, p_list[i]));
}
}

2
panda/src/char/characterJoint.h
View File

@ -65,7 +65,7 @@ private:
public:
static void register_with_read_factory(void);
virtual void write_datagram(BamWriter* manager, Datagram &me);
virtual int complete_pointers(vector_typedWritable &plist,
virtual int complete_pointers(vector_typedWritable &p_list,
BamReader *manager);
static TypedWritable *make_CharacterJoint(const FactoryParams &params);