--- deliantra/server/include/libproto.h 2010/04/28 11:19:09 1.94 +++ deliantra/server/include/libproto.h 2012/11/04 01:01:13 1.103 @@ -1,24 +1,24 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. - * - * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * + * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team * Copyright (©) 2002 Mark Wedel & Crossfire Development Team * Copyright (©) 1992 Frank Tore Johansen - * + * * Deliantra is free software: you can redistribute it and/or modify it under * the terms of the Affero GNU General Public License as published by the * Free Software Foundation, either version 3 of the License, or (at your * option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the Affero GNU General Public License * and the GNU General Public License along with this program. If not, see * . - * + * * The authors can be reached via e-mail to */ @@ -45,7 +45,6 @@ void free_all_archs (); void check_generators (); bool load_archetype_file (const char *filename); -object *get_archetype (const char *name); unsigned long hasharch (const char *str, int tablesize); object *clone_arch (int type); object *object_create_arch (archetype *at); @@ -66,14 +65,12 @@ int exp_to_level (sint64 exp); sint64 level_to_min_exp (int level); int new_exp (const object *ob); -void init_experience (); +void _reload_exp_table (); /* friend.c */ void add_friendly_object (object *op); 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 +122,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 +225,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);