ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.210 by root, Mon Apr 21 07:01:40 2008 UTC vs.
Revision 1.211 by root, Mon Apr 21 21:32:32 2008 UTC

1503 return pl; 1503 return pl;
1504 } 1504 }
1505 else 1505 else
1506 { 1506 {
1507 // maybe there is a player standing on the same mapspace 1507 // maybe there is a player standing on the same mapspace
1508 if (object *pl = env->ms ().player ()) 1508 if (object *pl = op->ms ().player ())
1509 return pl; 1509 return pl;
1510 } 1510 }
1511 } 1511 }
1512 1512
1513 return 0; 1513 return 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines