ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/player.h
(Generate patch)

Comparing deliantra/server/include/player.h (file contents):
Revision 1.29 by root, Wed Dec 20 09:14:22 2006 UTC vs.
Revision 1.32 by root, Sat Dec 23 06:21:02 2006 UTC

… …
108 uint32 kills; 108 uint32 kills;
109}; 109};
110 110
111ACC_CLASS (player) 111ACC_CLASS (player)
112 112
113// memsettable part of player 113struct player : zero_initialised, refcounted, attachable<player>
114struct player_pod
115{ 114{
115 player *ACC (RW, next); /* Pointer to next player, NULL if this is last */
116 client *ACC (RO, ns); /* Socket information for this player */
116 object_ptr ACC (RW, ob); /* The object representing the player */ 117 object_ptr ACC (RW, ob); /* The object representing the player */
117 maptile *loading; /* When entering a map in progress of loading, not really used */ 118 maptile *loading; /* When entering a map in progress of loading, not really used */
118 rangetype shoottype; /* Which range-attack is being used by player */ 119 rangetype shoottype; /* Which range-attack is being used by player */
119 bowtype_t bowtype; /* which firemode? */ 120 bowtype_t bowtype; /* which firemode? */
120 petmode_t petmode; /* which petmode? */ 121 petmode_t petmode; /* which petmode? */
… …
130 sint8 ACC (RW, gen_hp); /* Bonuses to regeneration speed of hp */ 131 sint8 ACC (RW, gen_hp); /* Bonuses to regeneration speed of hp */
131 sint8 ACC (RW, gen_sp); /* Bonuses to regeneration speed of sp */ 132 sint8 ACC (RW, gen_sp); /* Bonuses to regeneration speed of sp */
132 sint8 ACC (RW, gen_sp_armour); /* Penalty to sp regen from armour */ 133 sint8 ACC (RW, gen_sp_armour); /* Penalty to sp regen from armour */
133 sint8 ACC (RW, gen_grace); /* Bonuses to regeneration speed of grace */ 134 sint8 ACC (RW, gen_grace); /* Bonuses to regeneration speed of grace */
134 sint16 ACC (RW, item_power); /* Total item power of objects equipped */ 135 sint16 ACC (RW, item_power); /* Total item power of objects equipped */
135 uint8 ACC (RW, state); /* Input state of the player (name, password, etc */
136 uint8 ACC (RW, listening); /* Which priority will be used in info_all */ 136 uint8 ACC (RW, listening); /* Which priority will be used in info_all */
137 sint8 ACC (RW, last_level); /* Last level we sent to client */ 137 sint8 ACC (RW, last_level); /* Last level we sent to client */
138 138
139 /* Try to put all the bitfields together - saves some small amount of memory */ 139 /* Try to put all the bitfields together - saves some small amount of memory */
140 uint32 ACC (RO, braced):1; /* Will not move if braced, only attack */ 140 uint32 ACC (RO, braced):1; /* Will not move if braced, only attack */
141 uint32 ACC (RO, tmp_invis):1; /* Will invis go away when we attack ? */ 141 uint32 ACC (RO, tmp_invis):1; /* Will invis go away when we attack ? */
142 uint32 ACC (RO, do_los):1; /* If true, need to call update_los() in draw(), and clear */ 142 uint32 ACC (RO, do_los):1; /* If true, need to call update_los() in draw(), and clear */
143 uint32 ACC (RO, fire_on):1; /* Player should fire object, not move */ 143 uint32 ACC (RO, fire_on):1; /* Player should fire object, not move */
144 uint32 ACC (RO, run_on):1; /* Player should keep moving in dir until run is off */ 144 uint32 ACC (RO, run_on):1; /* Player should keep moving in dir until run is off */
145 uint32 ACC (RO, has_hit):1; /* If set, weapon_sp instead of speed will count */ 145 uint32 ACC (RO, has_hit):1; /* If set, weapon_sp instead of speed will count */
146 uint32 ACC (RO, name_changed):1; /* If true, the player has set a name. */
147 uint32 ACC (RO, peaceful):1; /* If set, won't attack friendly creatures */ 146 uint32 ACC (RO, peaceful):1; /* If set, won't attack friendly creatures */
148 uint32 ACC (RO, hidden):1; /* If True, player (DM) is hidden from view */ 147 uint32 ACC (RO, hidden):1; /* If True, player (DM) is hidden from view */
149 uint32 ACC (RO, explore):1; /* if True, player is in explore mode */ 148 uint32 ACC (RO, explore):1; /* if True, player is in explore mode */
150 149
151 object_ptr last_skill_ob[NUM_SKILLS]; /* the exp object */ 150 object_ptr last_skill_ob[NUM_SKILLS]; /* the exp object */
… …
161 uint32 ACC (RW, last_path_denied); /* Last spell denied sent to client */ 160 uint32 ACC (RW, last_path_denied); /* Last spell denied sent to client */
162 living ACC (RO, orig_stats); /* Permanent real stats of player */ 161 living ACC (RO, orig_stats); /* Permanent real stats of player */
163 living ACC (RO, last_stats); /* Last stats as sent to client */ 162 living ACC (RO, last_stats); /* Last stats as sent to client */
164 float ACC (RW, last_speed); /* Last speed as sent to client */ 163 float ACC (RW, last_speed); /* Last speed as sent to client */
165 sint16 last_resist[NROFATTACKS]; /* last resist values sent to client */ 164 sint16 last_resist[NROFATTACKS]; /* last resist values sent to client */
166 int Swap_First; /* First stat player has selected to swap */
167 object_ptr ACC (RW, last_used); /* Pointer to object last picked or applied */ 165 object_ptr ACC (RW, last_used); /* Pointer to object last picked or applied */
168 166
169 sint16 ACC (RW, bed_x), ACC (RW, bed_y); /* x,y - coordinates of respawn (savebed) */ 167 sint16 ACC (RW, bed_x), ACC (RW, bed_y); /* x,y - coordinates of respawn (savebed) */
170 char ACC (RW, savebed_map)[MAX_BUF]; /* map where player will respawn after death */ 168 char ACC (RW, savebed_map)[MAX_BUF]; /* map where player will respawn after death */
171 char ACC (RW, maplevel)[MAX_BUF]; /* On which level is the player? */ 169 char ACC (RW, maplevel)[MAX_BUF]; /* On which level is the player? */
… …
179 sint8 levsp[11]; /* Same for sp */ 177 sint8 levsp[11]; /* Same for sp */
180 sint8 levgrace[11]; /* And same for grace */ 178 sint8 levgrace[11]; /* And same for grace */
181 179
182 char ACC (RW, killer)[64]; /* Who killed this player. */ 180 char ACC (RW, killer)[64]; /* Who killed this player. */
183 181
184 char write_buf[MAX_BUF]; /* Holds arbitrary input from client */ 182 char write_buf[MAX_BUF]; /* Holds arbitrary input from client */ /* should go */
185 char input_buf[MAX_BUF]; /* Holds command to run */
186 char ACC (RW, password)[16]; /* 2 (seed) + 11 (crypted) + 1 (EOS) + 2 (safety) = 16 */ 183 char ACC (RW, password)[16]; /* 2 (seed) + 11 (crypted) + 1 (EOS) + 2 (safety) = 16 */
187 184
188 time_t ACC (RW, last_save_time); 185 time_t ACC (RW, last_save_time);
189 uint32 ACC (RW, last_save_tick); 186 uint32 ACC (RW, last_save_tick);
190 partylist *ACC (RW, party); /* Party this player is part of */ 187 partylist *ACC (RW, party); /* Party this player is part of */
… …
199 object_ptr ACC (RW, mark); /* marked object */ 196 object_ptr ACC (RW, mark); /* marked object */
200 /* Special DM fields */ 197 /* Special DM fields */
201 tag_t *stack_items; /* Item stack for patch/dump/... commands */ 198 tag_t *stack_items; /* Item stack for patch/dump/... commands */
202 int ACC (RW, stack_position); /* Current stack position, 0 for no item */ 199 int ACC (RW, stack_position); /* Current stack position, 0 for no item */
203 sint8 blocked_los[MAP_CLIENT_X][MAP_CLIENT_Y]; /* array showing what spaces */ 200 sint8 blocked_los[MAP_CLIENT_X][MAP_CLIENT_Y]; /* array showing what spaces */
204 /* the player can see. For maps smaller than */ 201 /* the player can see. For maps smaller than */
205 /* MAP_CLIENT_.., the upper left is used */ 202 /* MAP_CLIENT_.., the upper left is used */
206};
207 203
208struct player : zero_initialised, attachable<player>, player_pod 204 shstr ACC (RW, invis_race); /* What race invisible to? */
209{ 205 bool ACC (RW, enable_save);
210 player *next; /* Pointer to next player, NULL if this is last */
211 client *ACC (RO, socket); /* Socket information for this player */
212 Output_Buf outputs[NUM_OUTPUT_BUFS]; /* holds output strings to client */ 206 Output_Buf outputs[NUM_OUTPUT_BUFS]; /* holds output strings to client */
213 shstr invis_race; /* What race invisible to? */
214 207
215 void clear () 208 static player *create ();
216 { 209 static player *load (const char *path);
217 memset (static_cast < player_pod * >(this), 0, sizeof (player_pod)); 210 void save (bool final = false);
218 attachable_clear ();
219 invis_race = 0;
220 211
221 for (int i = 0; i < NUM_OUTPUT_BUFS; i++) 212 void connect (client *ns);
222 outputs[i].buf = 0;
223 }
224};
225 213
214 ~player ();
215
216private:
217 void set_object (object *op);
218 player ();
219};
220

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines