--- deliantra/server/include/player.h 2006/12/25 11:25:49 1.35 +++ deliantra/server/include/player.h 2006/12/31 21:02:04 1.39 @@ -90,22 +90,22 @@ }; /* not really the player, but tied pretty closely */ +INTERFACE_CLASS (partylist) struct partylist { - char *partyleader; - char passwd[9]; - partylist *next; - char *partyname; + char *ACC (RW, partyleader); + char ACC (RW, passwd)[9]; + partylist *ACC (RW, next); + char *ACC (RW, partyname); -#ifdef PARTY_KILL_LOG struct party_kill { char killer[MAX_NAME + 1], dead[MAX_NAME + 1]; sint64 exp; } party_kills[PARTY_KILL_LOG]; -#endif - sint64 total_exp; - uint32 kills; + + sint64 ACC (RW, total_exp); + uint32 ACC (RW, kills); }; #define for_all_players(var) for (player *var = first_player; var; var = var->next) @@ -166,8 +166,8 @@ object_ptr ACC (RW, last_used); /* Pointer to object last picked or applied */ sint16 ACC (RW, bed_x), ACC (RW, bed_y); /* x,y - coordinates of respawn (savebed) */ - char ACC (RW, savebed_map)[MAX_BUF]; /* map where player will respawn after death */ - char ACC (RW, maplevel)[MAX_BUF]; /* On which level is the player? */ + shstr ACC (RW, savebed_map); /* map where player will respawn after death */ + shstr ACC (RW, maplevel); /* On which level is the player? */ char ACC (RW, spellparam)[MAX_BUF]; /* What param to add to spells */ char ACC (RW, own_title)[MAX_NAME]; /* Title the player has chosen for themself */ @@ -206,14 +206,17 @@ bool ACC (RW, enable_save); Output_Buf outputs[NUM_OUTPUT_BUFS]; /* holds output strings to client */ - static player *create (); - static player *load (const char *path); - void save (bool final = false); + MTH static player *create (); + MTH static player *load (const char *path); + MTH void save (bool final = false); void do_destroy (); void gather_callbacks (AV *&callbacks, event_type event) const; - void connect (client *ns); - void disconnect (); + MTH void connect (client *ns); + MTH void disconnect (); + + // enters the initial map, after login or creation + MTH void enter_map (); ~player ();