--- deliantra/server/include/player.h 2007/01/07 02:39:14 1.43 +++ deliantra/server/include/player.h 2007/01/15 21:06:19 1.45 @@ -1,26 +1,26 @@ /* - CrossFire, A Multiplayer game for X-windows - - Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team - Copyright (C) 2002 Mark Wedel & Crossfire Development Team - Copyright (C) 1992 Frank Tore Johansen - - This program 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 2 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, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - The authors can be reached via e-mail at crossfire@schmorp.de -*/ + * CrossFire, A Multiplayer game for X-windows + * + * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team + * Copyright (C) 2002 Mark Wedel & Crossfire Development Team + * Copyright (C) 1992 Frank Tore Johansen + * + * This program 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 2 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, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * The authors can be reached via e-mail at crossfire@schmorp.de + */ #define NUM_OUTPUT_BUFS 5 struct Output_Buf @@ -134,7 +134,6 @@ sint8 ACC (RW, gen_grace); /* Bonuses to regeneration speed of grace */ sint16 ACC (RW, item_power); /* Total item power of objects equipped */ uint8 ACC (RW, listening); /* Which priority will be used in info_all */ - sint8 ACC (RW, last_level); /* Last level we sent to client */ /* Try to put all the bitfields together - saves some small amount of memory */ bool ACC (RW, braced); /* Will not move if braced, only attack */ @@ -146,21 +145,9 @@ bool ACC (RW, peaceful); /* If set, won't attack friendly creatures */ bool ACC (RW, hidden); /* If True, player (DM) is hidden from view */ - object_ptr last_skill_ob[NUM_SKILLS]; /* the exp object */ - sint64 last_skill_exp[NUM_SKILLS]; /* shadow register. if != exp. obj update client */ - float ACC (RW, weapon_sp); /* Penalties to speed when fighting w speed >ws/10 */ - float ACC (RW, last_weapon_sp); /* if diff than weapon_sp, update client */ - uint16 ACC (RW, last_flags); /* fire/run on flags for last tick */ - sint32 ACC (RW, last_weight); /* Last weight as sent to client; -1 means do not send weight */ - sint32 ACC (RW, last_weight_limit); /* Last weight limit transmitted to client */ - uint32 ACC (RW, last_path_attuned); /* Last spell attunment sent to client */ - uint32 ACC (RW, last_path_repelled); /* Last spell repelled sent to client */ - uint32 ACC (RW, last_path_denied); /* Last spell denied sent to client */ living ACC (RO, orig_stats); /* Permanent real stats of player */ - living ACC (RO, last_stats); /* Last stats as sent to client */ - float ACC (RW, last_speed); /* Last speed as sent to client */ - sint16 ACC (RW, last_resist[NROFATTACKS]); /* last resist values sent to client */ + object_ptr last_skill_ob[NUM_SKILLS]; /* the exp object */ 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) */ @@ -181,8 +168,6 @@ char write_buf[MAX_BUF]; /* Holds arbitrary input from client */ /* should go */ char ACC (RW, password)[16]; /* 2 (seed) + 11 (crypted) + 1 (EOS) + 2 (safety) = 16 */ - time_t ACC (RW, last_save_time); - uint32 ACC (RW, last_save_tick); partylist *ACC (RW, party); /* Party this player is part of */ partylist *ACC (RW, party_to_join); /* used when player wants to join a party */ /* but we will have to get password first */