Update of /cvsroot/flatland/flatland/flatland
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23272/flatland
Modified Files:
flatland.h
Log Message:
change GetObject to GetFlatlandObject
Index: flatland.h
===================================================================
RCS file: /cvsroot/flatland/flatland/flatland/flatland.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** flatland.h 23 Apr 2006 17:23:50 -0000 1.4
--- flatland.h 29 Apr 2006 21:59:52 -0000 1.5
***************
*** 195,199 ****
/// - Container::begin()
/// - Container::end()
! /// The objects in the container must have a GetObject() method.
template<class Container>
void World::GenerateContacts(const Container& space)
--- 195,199 ----
/// - Container::begin()
/// - Container::end()
! /// The objects in the container must have a GetFlatlandObject() method.
template<class Container>
void World::GenerateContacts(const Container& space)
***************
*** 204,208 ****
for (o1 = space.begin(); o1 != space.end(); ++o1)
{
! Object* object1 = (*o1)->GetObject();
if (!object1)
continue;
--- 204,208 ----
for (o1 = space.begin(); o1 != space.end(); ++o1)
{
! Object* object1 = (*o1)->GetFlatlandObject();
if (!object1)
continue;
***************
*** 211,215 ****
for (++o2; o2 != space.end(); ++o2)
{
! Object* object2 = (*o2)->GetObject();
if (!object2)
continue;
--- 211,215 ----
for (++o2; o2 != space.end(); ++o2)
{
! Object* object2 = (*o2)->GetFlatlandObject();
if (!object2)
continue;
***************
*** 248,252 ****
/// - Container::begin()
/// - Container::end()
! /// The objects in the container must have a GetObject() method.
template<class Container>
bool World::IsCorrupt(const Container& space) const
--- 248,252 ----
/// - Container::begin()
/// - Container::end()
! /// The objects in the container must have a GetFlatlandObject() method.
template<class Container>
bool World::IsCorrupt(const Container& space) const
***************
*** 255,259 ****
for (o = space.begin(); o != space.end(); ++o)
{
! Object* object = (*o)->GetObject();
if (!object)
continue;
--- 255,259 ----
for (o = space.begin(); o != space.end(); ++o)
{
! Object* object = (*o)->GetFlatlandObject();
if (!object)
continue;
|
