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

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.64 by root, Sun Apr 20 00:44:13 2008 UTC vs.
Revision 1.65 by root, Sun Apr 20 18:48:51 2008 UTC

997 { 997 {
998 object *tmp = op->below; 998 object *tmp = op->below;
999 999
1000 while (tmp && !tmp->client_visible ()) 1000 while (tmp && !tmp->client_visible ())
1001 tmp = tmp->below; 1001 tmp = tmp->below;
1002
1002 if (tmp) 1003 if (tmp)
1003 examine (op, tmp); 1004 examine (op, tmp);
1004 } 1005 }
1005 else 1006 else
1006 { 1007 {
1007 object *tmp = find_best_object_match (op, params); 1008 object *tmp = find_best_object_match (op, params);
1008 1009
1009 if (tmp) 1010 if (tmp)
1010 examine (op, tmp); 1011 examine (op, tmp);
1011 else 1012 else
1012 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find an object that matches %s", params); 1013 op->contr->infobox (MSG_CHANNEL ("examine"), format ("Could not find an object that matches %s", params));
1013 } 1014 }
1015
1014 return 0; 1016 return 0;
1015} 1017}
1016 1018
1017/* op should be a player. 1019/* op should be a player.
1018 * we return the object the player has marked with the 'mark' command 1020 * we return the object the player has marked with the 'mark' command

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines