ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/libproto.h
(Generate patch)

Comparing deliantra/server/include/libproto.h (file contents):
Revision 1.93 by root, Sun Apr 25 10:45:38 2010 UTC vs.
Revision 1.94 by root, Wed Apr 28 11:19:09 2010 UTC

149object *merge_ob (object *op, object *top); 149object *merge_ob (object *op, object *top);
150object *insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y); 150object *insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y);
151object *insert_ob_in_map (object *op, maptile *m, object *originator, int flag); 151object *insert_ob_in_map (object *op, maptile *m, object *originator, int flag);
152void replace_insert_ob_in_map (shstr_tmp archname, object *op); 152void replace_insert_ob_in_map (shstr_tmp archname, object *op);
153object *insert_ob_in_ob (object *op, object *where); 153object *insert_ob_in_ob (object *op, object *where);
154int check_move_on (object *op, object *originator); 154int check_move_on (object *op, object *originator, int flags = 0);
155object *present_arch (const archetype *at, maptile *m, int x, int y); 155object *present_arch (const archetype *at, maptile *m, int x, int y);
156object *present (unsigned char type, maptile *m, int x, int y); 156object *present (unsigned char type, maptile *m, int x, int y);
157object *present_in_ob (unsigned char type, const object *op); 157object *present_in_ob (unsigned char type, const object *op);
158object *present_in_ob_by_name (int type, const char *str, const object *op); 158object *present_in_ob_by_name (int type, const char *str, const object *op);
159object *present_arch_in_ob (const archetype *at, const object *op); 159object *present_arch_in_ob (const archetype *at, const object *op);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines