--- deliantra/server/include/sproto.h 2007/03/02 16:06:41 1.54
+++ deliantra/server/include/sproto.h 2009/01/13 12:07:42 1.101
@@ -1,5 +1,23 @@
-// server/c_party.C
-int same_party (partylist *a, partylist *b);
+/*
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
+ *
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ *
+ * Deliantra is free software: you can redistribute it and/or modify
+ * it under the terms of the 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 GNU General Public License
+ * along with this program. If not, see .
+ *
+ * The authors can be reached via e-mail to
+ */
/* alchemy.c */
int need_identify (const object *obj);
@@ -7,7 +25,7 @@
const char *cost_string_from_value (sint64 cost, int approx);
void pay_player (object *pl, sint64 amount);
sint64 pay_player_arch (object *pl, const char *arch, sint64 amount);
-void attempt_do_alchemy (object *caster, object *cauldron);
+void attempt_do_alchemy (object *caster, object *cauldron, object *skill);
int content_recipe_value (object *op);
int numb_ob_inside (object *op);
object *attempt_recipe (object *caster, object *cauldron, int ability, recipe *rp, int nbatches);
@@ -23,12 +41,10 @@
int apply_transport (object *pl, object *transport, int aflag);
int should_director_abort (object *op, object *victim);
int apply_potion (object *op, object *tmp);
-int improve_weapon_stat (object *op, object *improver, object *weapon, signed char *stat, int sacrifice_count, const char *statname);
int prepare_weapon (object *op, object *improver, object *weapon);
int improve_weapon (object *op, object *improver, object *weapon);
int check_improve_weapon (object *op, object *tmp);
int improve_armour (object *op, object *improver, object *armour);
-int convert_item (object *item, object *converter);
int apply_container (object *op, object *sack);
int esrv_apply_container (object *op, object *sack);
void move_apply (object *trap, object *victim, object *originator);
@@ -41,7 +57,6 @@
int manual_apply (object *op, object *tmp, int aflag);
int player_apply (object *pl, object *op, int aflag, int quiet);
void player_apply_below (object *pl);
-object *get_item_from_body_location (object *start, int loc);
int unapply_for_ob (object *who, object *op, int aflags);
int can_apply_object (object *who, object *op);
int apply_special (object *who, object *op, int aflags);
@@ -53,6 +68,9 @@
void scroll_failure (object *op, int failure, int power);
void apply_changes_to_player (object *pl, object *change);
void apply_item_transformer (object *pl, object *transformer);
+extern void handle_apply_yield (object *op);
+void apply_lamp (object *op, bool switch_on);
+void get_animation_from_arch (object *op, arch_ptr a);
/* attack.c */
void cancellation (object *op);
@@ -77,14 +95,9 @@
int adj_attackroll (object *hitter, object *target);
int is_aimed_missile (object *op);
-/* ban.c */
-int checkbanned (const char *login, const char *host);
-
/* build_map.c */
int can_build_over (struct mapdef *map, object *tmp, short x, short y);
void remove_marking_runes (struct mapdef *map, short x, short y);
-int find_unused_connected_value (struct mapdef *map);
-int find_or_create_connection_for_map (object *pl, short x, short y, object *rune);
object *get_connection_rune (object *pl, short x, short y);
object *get_msg_book (object *pl, short x, short y);
object *get_wall (struct mapdef *map, int x, int y);
@@ -112,21 +125,15 @@
int command_hiscore (object *op, char *params);
int command_debug (object *op, char *params);
int command_dumpbelow (object *op, char *params);
+int command_dumpfriendlyobjects (object *op, char *params);
int command_wizpass (object *op, char *params);
int command_wizcast (object *op, char *params);
-int command_dumpallobjects (object *op, char *params);
-int command_dumpfriendlyobjects (object *op, char *params);
-int command_dumpallarchetypes (object *op, char *params);
-int command_ssdumptable (object *op, char *params);
-int command_dumpmap (object *op, char *params);
-int command_dumpallmaps (object *op, char *params);
int command_printlos (object *op, char *params);
int command_version (object *op, char *params);
void bug_report (const char *reportstring);
int command_statistics (object *pl, char *params);
int command_fix_me (object *op, char *params);
int command_players (object *op, char *paramss);
-int command_logs (object *op, char *params);
int command_bowmode (object *op, char *params);
int command_showpets (object *op, char *params);
int command_resistances (object *op, char *params);
@@ -169,29 +176,28 @@
int command_take (object *op, char *params);
void put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof);
void drop_object (object *op, object *tmp, uint32 nrof);
+void drop_object (object *dropper, object *obj);
void drop (object *op, object *tmp);
int command_dropall (object *op, char *params);
int command_drop (object *op, char *params);
int command_examine (object *op, char *params);
object *find_marked_object (object *op);
void examine_monster (object *op, object *tmp);
-char *long_desc (object *tmp, object *pl);
+const char *long_desc (object *tmp, object *pl);
void examine (object *op, object *tmp);
-void inventory (object *op, object *inv);
int command_pickup (object *op, char *params);
void set_pickup_mode (object *op, int i);
int command_search_items (object *op, char *params);
int command_rename_item (object *op, char *params);
/* c_party.c */
-int same_party (partylist *a, partylist *b);
partylist *get_firstparty (void);
void remove_party (partylist *target_party);
void obsolete_parties (void);
-void add_kill_to_party (partylist *party, char *killer, char *dead, long exp);
+void add_kill_to_party (partylist *party, const char *killer, const char *dead, long exp);
int confirm_party_password (object *op);
void receive_party_password (object *op, char k);
-void send_party_message (object *op, char *msg);
+void send_party_message (object *op, const char *msg);
int command_gsay (object *op, char *params);
int command_party (object *op, char *params);
@@ -211,7 +217,6 @@
int command_setgod (object *op, char *params);
int command_banish (object *op, char *params);
int command_save_overlay (object *op, char *params);
-int command_toggle_shout (object *op, char *params);
int command_freeze (object *op, char *params);
int command_arrest (object *op, char *params);
int command_summon (object *op, char *params);
@@ -235,9 +240,6 @@
int command_learn_spell (object *op, char *params);
int command_learn_special_prayer (object *op, char *params);
int command_forget_spell (object *op, char *params);
-int command_listplugins (object *op, char *params);
-int command_loadplugin (object *op, char *params);
-int command_unloadplugin (object *op, char *params);
int command_dmhide (object *op, char *params);
void dm_stack_pop (player *pl);
object *dm_stack_peek (player *pl);
@@ -260,17 +262,10 @@
/* disease.c */
int move_disease (object *disease);
-int remove_symptoms (object *disease);
-object *find_symptom (object *disease);
-int check_infection (object *disease);
int infect_object (object *victim, object *disease, int force);
-int do_symptoms (object *disease);
-int grant_immunity (object *disease);
int move_symptom (object *symptom);
int check_physically_infect (object *victim, object *hitter);
-object *find_disease (object *victim);
-int cure_disease (object *sufferer, object *caster);
-int reduce_symptoms (object *sufferer, int reduction);
+int cure_disease (object *sufferer, object *caster, object *spell);
/* egoitem.c */
int create_artifact (object *op, const char *artifactname);
@@ -282,66 +277,28 @@
void display_high_score (object *op, int max, const char *match);
/* gods.c */
-int lookup_god_by_name (const char *name);
-object *find_god (const char *name);
-const char *determine_god (object *op);
+int lookup_god_by_name (shstr_cmp name);
+object *find_god (shstr_cmp name);
+shstr_tmp determine_god (object *op);
void pray_at_altar (object *pl, object *altar, object *skill);
void become_follower (object *op, object *new_god);
int worship_forbids_use (object *op, object *exp_obj, uint32 flag, const char *string);
void stop_using_item (object *op, int type, int number);
void update_priest_flag (object *god, object *exp_ob, uint32 flag);
-archetype *determine_holy_arch (object *god, const char *type);
+archetype *determine_holy_arch (object *god, shstr_cmp type);
void god_intervention (object *op, object *god, object *skill);
int god_examines_priest (object *op, object *god);
int god_examines_item (object *god, object *item);
int get_god (object *priest);
-const char *get_god_for_race (const char *race);
int tailor_god_spell (object *spellop, object *caster);
/* init.c */
-void set_logfile (char *val);
-void call_version (void);
-void showscores (void);
-void set_debug (void);
-void unset_debug (void);
-void set_mondebug (void);
-void set_dumpmon1 (void);
-void set_dumpmon2 (void);
-void set_dumpmon3 (void);
-void set_dumpmon4 (void);
-void set_dumpmon5 (void);
-void set_dumpmon6 (void);
-void set_dumpmon7 (void);
-void set_dumpmon8 (void);
-void set_dumpmon9 (void);
-void set_dumpmont (char *name);
-void set_daemon (void);
-void set_datadir (char *path);
-void set_confdir (char *path);
-void set_localdir (char *path);
-void set_mapdir (char *path);
-void set_archetypes (char *path);
-void set_regions (char *path);
-void set_treasures (char *path);
-void set_uniquedir (char *path);
-void set_templatedir (char *path);
-void set_playerdir (char *path);
-void set_tmpdir (char *path);
-void showscoresparm (char *data);
-void set_csport (char *val);
+void load_settings (void);
+void load_materials (void);
void init (int argc, char **argv);
void usage (void);
void help (void);
void init_beforeplay (void);
-void init_startup (void);
-void compile_info (void);
-void rec_sigsegv (int i);
-void rec_sigint (int i);
-void rec_sighup (int i);
-void rec_sigquit (int i);
-void rec_sigpipe (int i);
-void rec_sigbus (int i);
-void rec_sigterm (int i);
void init_signals (void);
void init_races (void);
void dump_races (void);
@@ -354,7 +311,6 @@
int verify_player (const char *name, char *password);
int check_name (player *me, const char *name);
int create_savedir_if_needed (char *savedir);
-void destroy_object (object *op);
void copy_file (const char *filename, FILE *fpout);
/* main.c */
@@ -362,7 +318,6 @@
void version (object *op);
void info_keys (object *op);
char *crypt_string (char *str, char *salt);
-int check_password (char *typed, char *crypted);
void enter_player_savebed (object *op);
void leave_map (object *op);
void set_map_timeout (maptile *oldmap);
@@ -372,7 +327,6 @@
void process_events ();
void clean_tmp_files (void);
void leave (player *pl,int draw_exit);
-int forbid_play (void);
void do_specials (void);
int main (int argc, char **argv);
@@ -442,7 +396,6 @@
int summon_golem (object *op, object *caster, int dir, object *spob);
object *choose_cult_monster (object *pl, object *god, int summon_level);
int summon_object (object *op, object *caster, object *spell_ob, int dir, const char *stringarg);
-object *get_real_owner (object *ob);
int should_arena_attack (object *pet, object *owner, object *target);
/* player.c */
@@ -470,19 +423,18 @@
void flee_player (object *op);
int check_pick (object *op);
object *find_arrow (object *op, const char *type);
-object *find_better_arrow (object *op, object *target, const char *type, int *better);
-object *pick_arrow_target (object *op, const char *type, int dir);
+object *find_better_arrow (object *op, object *target, shstr_cmp type, int *better);
+object *pick_arrow_target (object *op, shstr_cmp type, int dir);
int fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy);
int player_fire_bow (object *op, int dir);
void fire_misc_object (object *op, int dir);
-void fire (object *op, int dir);
+bool fire (object *op, int dir);
object *find_key (object *pl, object *container, object *door);
-void move_player_attack (object *op, int dir);
-int move_player (object *op, int dir);
-int handle_newcs_player (object *op);
+bool move_player_attack (object *op, int dir);
+bool move_player (object *op, int dir);
+bool handle_newcs_player (object *op);
int save_life (object *op);
-void remove_unpaid_objects (object *op, object *env);
-char *gravestone_text (object *op);
+const char *gravestone_text (object *op);
void do_some_living (object *op);
void kill_player (object *op);
void loot_object (object *op);
@@ -500,89 +452,6 @@
void dragon_ability_gain (object *who, int atnr, int level);
void player_unready_range_ob (player *pl, object *ob);
-/* plugins.c */
-int execute_event (object *op, int eventcode, object *activator, object *third, const char *message, int fix);
-int execute_global_event (int eventcode, ...);
-int plugins_init_plugin (const char *libfile);
-void *cfapi_get_hooks (int *type, ...);
-int plugins_remove_plugin (const char *id);
-crossfire_plugin *plugins_find_plugin (const char *id);
-void plugins_display_list (object *op);
-void *cfapi_system_find_animation (int *type, ...);
-void *cfapi_system_strdup (int *type, ...);
-void *cfapi_system_register_global_event (int *type, ...);
-void *cfapi_system_unregister_global_event (int *type, ...);
-void *cfapi_system_check_path (int *type, ...);
-void *cfapi_system_re_cmp (int *type, ...);
-void *cfapi_system_directory (int *type, ...);
-void *cfapi_map_get_map (int *type, ...);
-void *cfapi_map_has_been_loaded (int *type, ...);
-void *cfapi_map_create_path (int *type, ...);
-void *cfapi_map_get_map_property (int *type, ...);
-void *cfapi_map_set_map_property (int *type, ...);
-void *cfapi_map_out_of_map (int *type, ...);
-void *cfapi_map_update_position (int *type, ...);
-void *cfapi_map_delete_map (int *type, ...);
-void *cfapi_map_message (int *type, ...);
-void *cfapi_map_get_object_at (int *type, ...);
-void *cfapi_map_get_flags (int *type, ...);
-void *cfapi_map_present_arch_by_name (int *type, ...);
-void *cfapi_object_move (int *type, ...);
-void *cfapi_object_get_key (int *type, ...);
-void *cfapi_object_set_key (int *type, ...);
-void *cfapi_object_get_property (int *type, ...);
-void *cfapi_object_set_property (int *type, ...);
-void *cfapi_object_apply_below (int *type, ...);
-void *cfapi_object_apply (int *type, ...);
-void *cfapi_object_identify (int *type, ...);
-void *cfapi_object_describe (int *type, ...);
-void *cfapi_object_drain (int *type, ...);
-void *cfapi_object_fix (int *type, ...);
-void *cfapi_object_give_skill (int *type, ...);
-void *cfapi_object_transmute (int *type, ...);
-void *cfapi_object_remove (int *type, ...);
-void *cfapi_object_delete (int *type, ...);
-void *cfapi_object_clone (int *type, ...);
-void *cfapi_object_find (int *type, ...);
-void *cfapi_object_create (int *type, ...);
-void *cfapi_object_insert (int *type, ...);
-void *cfapi_object_split (int *type, ...);
-void *cfapi_object_merge (int *type, ...);
-void *cfapi_object_distance (int *type, ...);
-void *cfapi_object_update (int *type, ...);
-void *cfapi_object_clear (int *type, ...);
-void *cfapi_object_reset (int *type, ...);
-void *cfapi_object_check_inventory (int *type, ...);
-void *cfapi_object_clean_object (int *type, ...);
-void *cfapi_object_on_same_map (int *type, ...);
-void *cfapi_object_spring_trap (int *type, ...);
-void *cfapi_object_check_trigger (int *type, ...);
-void *cfapi_object_query_cost (int *type, ...);
-void *cfapi_object_query_money (int *type, ...);
-void *cfapi_object_cast (int *type, ...);
-void *cfapi_object_learn_spell (int *type, ...);
-void *cfapi_object_forget_spell (int *type, ...);
-void *cfapi_object_check_spell (int *type, ...);
-void *cfapi_object_pay_amount (int *type, ...);
-void *cfapi_object_pay_item (int *type, ...);
-void *cfapi_object_transfer (int *type, ...);
-void *cfapi_object_find_archetype_inside (int *type, ...);
-void *cfapi_object_drop (int *type, ...);
-void *cfapi_object_take (int *type, ...);
-void *cfapi_object_say (int *type, ...);
-void *cfapi_object_speak (int *type, ...);
-void *cfapi_player_find (int *type, ...);
-void *cfapi_player_message (int *type, ...);
-void *cfapi_player_send_inventory (int *type, ...);
-void *cfapi_object_teleport (int *type, ...);
-void *cfapi_object_pickup (int *type, ...);
-void *cfapi_archetype_get_first (int *type, ...);
-void *cfapi_archetype_get_property (int *type, ...);
-void *cfapi_party_get_property (int *type, ...);
-void *cfapi_region_get_property (int *type, ...);
-CommArray_s *find_plugin_command (char *cmd, object *op);
-int initPlugins (void);
-
/* resurrection.c */
int cast_raise_dead_spell (object *op, object *caster, object *spell, int dir, const char *arg);
int resurrection_fails (int levelcaster, int leveldead);
@@ -609,10 +478,10 @@
int pay_for_amount (sint64 to_pay, object *pl);
int pay_for_item (object *op, object *pl);
int can_pay (object *pl);
-void sell_item (object *op, object *pl);
+bool sell_item (object *op, object *pl);
double shopkeeper_approval (const maptile *map, const object *player);
int describe_shop (const object *op);
-void shop_listing (object *op);
+void shop_listing (object *sign, object *op);
bool is_in_shop (object *o);
bool is_in_shop (maptile *map, int x, int y);
@@ -635,10 +504,6 @@
/* skill_util.c */
void init_skills (void);
void link_player_skills (object *op);
-object *find_skill_by_name (object *who, const char *name);
-object *find_skill_by_number (object *who, int skillno);
-int change_skill (object *who, object *new_skill, int flag);
-void clear_skill (object *who);
int do_skill (object *op, object *part, object *skill, int dir, const char *string);
int calc_skill_exp (object *who, object *op, object *skill);
int learn_skill (object *pl, object *scroll);
@@ -692,7 +557,6 @@
int cast_word_of_recall (object *op, object *caster, object *spell_ob);
int cast_wonder (object *op, object *caster, int dir, object *spell_ob);
int perceive_self (object *op);
-int cast_create_town_portal (object *op, object *caster, object *spell, int dir);
int magic_wall (object *op, object *caster, int dir, object *spell_ob);
int dimension_door (object *op, object *caster, object *spob, int dir);
int cast_heal (object *op, object *caster, object *spell, int dir);
@@ -713,18 +577,16 @@
int write_mark (object *op, object *spell, const char *msg);
/* spell_util.c */
-object *find_random_spell_in_ob (object *ob, const char *skill);
+object *find_random_spell_in_ob (object *ob, shstr_cmp skill = shstr_cmp ());
void set_spell_skill (object *op, object *caster, object *spob, object *dest);
-void init_spells (void);
-void dump_spells (void);
void spell_effect (object *spob, int x, int y, maptile *map, object *originator);
int min_casting_level (object *caster, object *spell);
-int caster_level (object *caster, object *spell);
+int casting_level (object *caster, object *spell);
sint16 SP_level_spellpoint_cost (object *caster, object *spell, int flags);
int SP_level_dam_adjust (object *caster, object *spob);
int SP_level_duration_adjust (object *caster, object *spob);
int SP_level_range_adjust (object *caster, object *spob);
-object *check_spell_known (object *op, const char *name);
+object *check_spell_known (object *op, shstr_cmp name);
object *lookup_spell_by_name (object *op, const char *spname);
int reflwall (maptile *m, int x, int y, object *sp_op);
int cast_create_obj (object *op, object *caster, object *new_op, int dir);
@@ -761,8 +623,6 @@
/* time.c */
void remove_door (object *op);
void remove_door2 (object *op);
-void generate_monster_inv (object *gen);
-void generate_monster_arch (object *gen);
void generate_monster (object *gen);
void remove_force (object *op);
void remove_blindness (object *op);
@@ -784,20 +644,8 @@
void move_duplicator (object *op);
void move_creator (object *creator);
void move_marker (object *op);
-int process_object (object *op);
-
-/* timers.c */
-void cftimer_process_timers (void);
-void cftimer_process_event (object *ob);
-int cftimer_create (int id, long delay, object *ob, int mode);
-int cftimer_destroy (int id);
-int cftimer_find_free_id (void);
+void process_object (object *op);
/* weather.c */
void set_darkness_map (maptile *m);
-void tick_the_clock (void);
-void init_weather (void);
-void weather_effect (const char *filename);
-int worldmap_to_weathermap (int x, int y, int *wx, int *wy, maptile *m);
-int real_world_temperature (int x, int y, maptile *m);
-int similar_direction (int a, int b);
+void adjust_daylight (void);