[ViewVC] Diff of: cvs/deliantra/server/include/libproto.h

Comparing deliantra/server/include/libproto.h (file contents):
Revision 1.93 by root, Sun Apr 25 10:45:38 2010 UTC vs.
Revision 1.95 by root, Thu Apr 29 12:24:04 2010 UTC

 object *merge_ob (object *op, object *top);
 object *insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y);
 object *insert_ob_in_map (object *op, maptile *m, object *originator, int flag);
 void replace_insert_ob_in_map (shstr_tmp archname, object *op);
 object *insert_ob_in_ob (object *op, object *where);
-int check_move_on (object *op, object *originator);
+int check_move_on (object *op, object *originator, int flags = 0);
 object *present_arch (const archetype *at, maptile *m, int x, int y);
 object *present (unsigned char type, maptile *m, int x, int y);
 object *present_in_ob (unsigned char type, const object *op);
 object *present_in_ob_by_name (int type, const char *str, const object *op);
 object *present_arch_in_ob (const archetype *at, const object *op);
 void fix_flesh_item (object *item, object *donor);
 /* utils.c */
 int random_roll (int min, int max, const object *op, int goodbad);
 sint64 random_roll64 (sint64 min, sint64 max, const object *op, int goodbad);
 int die_roll (int num, int size, const object *op, int goodbad);
-materialtype_t *name_to_material (const shstr_tmp name);
 void transmute_materialname (object *op, const object *change);
 void strip_endline (char *buf);
 void replace (const char *src, const char *key, const char *replacement, char *result, size_t resultsize);
 /* loader.c */
 int set_variable (object *op, char *buf);

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines