--- deliantra/server/include/sproto.h 2008/04/21 23:35:24 1.84 +++ deliantra/server/include/sproto.h 2008/09/23 04:29:11 1.91 @@ -1,7 +1,7 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * 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 @@ -134,7 +134,6 @@ 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); @@ -177,7 +176,6 @@ 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 update_after_inventory_change (object *op); void drop (object *op, object *tmp); int command_dropall (object *op, char *params); int command_drop (object *op, char *params); @@ -198,7 +196,7 @@ 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); @@ -302,36 +300,8 @@ 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); @@ -472,7 +442,7 @@ bool move_player (object *op, int dir); bool handle_newcs_player (object *op); int save_life (object *op); -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); @@ -516,7 +486,7 @@ 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 *sign, object *op);