--- deliantra/server/include/player.h 2007/01/15 21:06:19 1.45 +++ deliantra/server/include/player.h 2007/05/18 19:46:22 1.57 @@ -1,5 +1,5 @@ /* - * CrossFire, A Multiplayer game for X-windows + * CrossFire, A Multiplayer game * * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team * Copyright (C) 2002 Mark Wedel & Crossfire Development Team @@ -22,42 +22,18 @@ * The authors can be reached via e-mail at crossfire@schmorp.de */ -#define NUM_OUTPUT_BUFS 5 -struct Output_Buf -{ - shstr buf; /* Actual string pointer */ - uint32 first_update; /* First time this message was stored */ - uint16 count; /* How many times we got this message */ -}; - -/* wand/rod/horn rolled into range_misc. They all use the same body location - * anyways. - */ -enum rangetype -{ - range_bottom = -1, - range_none = 0, - range_bow = 1, - range_magic = 2, - range_misc = 3, - range_golem = 4, - range_skill = 5, - range_builder = 6, - range_size = 7 -}; - enum bowtype_t { - bow_normal = 0, - bow_threewide = 1, + bow_normal = 0, + bow_threewide = 1, bow_spreadshot = 2, - bow_n = 3, /* must stay at 3 */ + bow_n = 3, /* must stay at 3 */ bow_ne = 4, - bow_e = 5, + bow_e = 5, bow_se = 6, - bow_s = 7, + bow_s = 7, bow_sw = 8, - bow_w = 9, + bow_w = 9, bow_nw = 10, /* must stay at 10 */ bow_bestarrow = 11 }; @@ -65,16 +41,16 @@ enum petmode_t { pet_normal = 0, - pet_sad = 1, + pet_sad = 1, pet_defend = 2, - pet_arena = 3 + pet_arena = 3, }; enum usekeytype { key_inventory = 0, - keyrings = 1, - containers = 2 + keyrings = 1, + containers = 2, }; /* This is used to control what to do when we need to unapply @@ -109,31 +85,34 @@ uint32 ACC (RW, kills); }; +// used for pet monster logic etc. +static bool +same_party (partylist *a, partylist *b) +{ + return a == b && a; +} + INTERFACE_CLASS (player) struct player : zero_initialised, attachable { - client *ACC (RO, ns); /* Socket information for this player */ - object *ACC (RW, ob); /* The object representing the player */ + client *ACC (RO, ns); /* Socket information for this player */ + object *ACC (RW, ob); /* The object representing the player */ int ACC (RO, active); - rangetype ACC (RW, shoottype); /* Which range-attack is being used by player */ - bowtype_t ACC (RW, bowtype); /* which firemode? */ - petmode_t ACC (RW, petmode); /* which petmode? */ - object_ptr ACC (RW, ranges[range_size]); /* object for each range. Set up in fix player. Note */ - /* That not all are used, it is just nice to map this 1:1 */ - /* With the range names */ - usekeytype ACC (RW, usekeys); /* Method for finding keys for doors */ - unapplymode ACC (RW, unapply); /* Method for auto unapply */ - uint32 ACC (RW, count); /* Any numbers typed before a command */ - uint32 ACC (RW, mode); /* Mode of player for pickup. */ - - sint8 ACC (RW, digestion); /* Any bonuses/penalties to digestion */ - sint8 ACC (RW, gen_hp); /* Bonuses to regeneration speed of hp */ - sint8 ACC (RW, gen_sp); /* Bonuses to regeneration speed of sp */ - sint8 ACC (RW, gen_sp_armour); /* Penalty to sp regen from armour */ - 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 */ + bowtype_t ACC (RW, bowtype); /* which firemode? */ + petmode_t ACC (RW, petmode); /* which petmode? */ + usekeytype ACC (RW, usekeys); /* Method for finding keys for doors */ + unapplymode ACC (RW, unapply); /* Method for auto unapply */ + uint32 ACC (RW, count); /* Any numbers typed before a command */ + uint32 ACC (RW, mode); /* Mode of player for pickup. */ + + sint8 ACC (RW, digestion); /* Any bonuses/penalties to digestion */ + sint8 ACC (RW, gen_hp); /* Bonuses to regeneration speed of hp */ + sint8 ACC (RW, gen_sp); /* Bonuses to regeneration speed of sp */ + sint8 ACC (RW, gen_sp_armour); /* Penalty to sp regen from armour */ + 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 */ /* Try to put all the bitfields together - saves some small amount of memory */ bool ACC (RW, braced); /* Will not move if braced, only attack */ @@ -141,15 +120,19 @@ bool ACC (RW, do_los); /* If true, need to call update_los() in draw(), and clear */ bool ACC (RW, fire_on); /* Player should fire object, not move */ bool ACC (RW, run_on); /* Player should keep moving in dir until run is off */ - bool ACC (RW, has_hit); /* If set, weapon_sp instead of speed will count */ bool ACC (RW, peaceful); /* If set, won't attack friendly creatures */ bool ACC (RW, hidden); /* If True, player (DM) is hidden from view */ float ACC (RW, weapon_sp); /* Penalties to speed when fighting w speed >ws/10 */ + float ACC (RW, weapon_sp_left); // same as speed_left, but for attacks living ACC (RO, orig_stats); /* Permanent real stats of player */ object_ptr last_skill_ob[NUM_SKILLS]; /* the exp object */ object_ptr ACC (RW, last_used); /* Pointer to object last picked or applied */ + object_ptr ACC (RW, combat_ob); // which weapon/bow/skill to use for direct attacks + object_ptr ACC (RW, ranged_ob); // which skill/item/spell to use for ranged attacks + object_ptr ACC (RW, golem); // the currently controlled golem + sint16 ACC (RW, bed_x), ACC (RW, bed_y); /* x,y - coordinates of respawn (savebed) */ shstr ACC (RW, savebed_map); /* map where player will respawn after death */ shstr ACC (RW, maplevel); /* On which level is the player? */ @@ -186,7 +169,6 @@ /* MAP_CLIENT_.., the upper left is used */ shstr ACC (RW, invis_race); /* What race invisible to? */ - Output_Buf outputs[NUM_OUTPUT_BUFS]; /* holds output strings to client */ MTH static player *create (); @@ -199,6 +181,10 @@ void do_destroy (); void gather_callbacks (AV *&callbacks, event_type event) const; + // wether the player can "see" this mapspace or not, decided by los + // 0 - nothing see, 100 - fully visible + MTH sint8 visibility_at (maptile *map, int x, int y) const; + MTH void connect (client *ns); MTH void disconnect (); @@ -208,6 +194,9 @@ // enters the initial map, after login or creation MTH void enter_map (); + MTH void chargen_race_done (); + MTH void chargen_race_next (); + ~player (); private: @@ -220,6 +209,6 @@ extern playervec players; #define for_all_players(var) \ - for (int _i = 0; _i < players.size (); ++_i) \ + for (unsigned _i = 0; _i < players.size (); ++_i) \ declvar (player *, var, players [_i])