--- deliantra/server/include/libproto.h 2010/04/28 11:19:09 1.94 +++ deliantra/server/include/libproto.h 2010/04/30 21:00:40 1.97 @@ -72,8 +72,6 @@ void remove_friendly_object (object *op); void dump_friendly_objects (); void clean_friendly_list (); -/* glue.c */ -void fatal (const char *msg); /* holy.c */ void init_gods (); godlink *get_rand_god (); @@ -125,7 +123,7 @@ sint64 level_exp (int level, double expmul); void calc_perm_exp (object *op); sint64 check_exp_adjust (const object *op, sint64 exp); -void change_exp (object *op, sint64 exp, const char *skill_name, int flag); +void change_exp (object *op, sint64 exp, shstr_tmp skill_name, int flag); void apply_death_exp_penalty (object *op); int did_make_save (const object *op, int level, int bonus); /* los.c */ @@ -228,10 +226,9 @@ void generate_artifact (object *op, int difficulty); 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); +int random_roll (int min, int max, const object *op, bool prefer_high); +sint64 random_roll64 (sint64 min, sint64 max, const object *op, bool prefer_high); +int die_roll (int num, int size, const object *op, bool prefer_high); 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);