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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.37 by root, Thu Dec 14 02:37:37 2006 UTC vs.
Revision 1.75 by root, Sat Dec 30 21:15:59 2006 UTC

… …
21 The author can be reached via e-mail to <crossfire@schmorp.de> 21 The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22*/
23 23
24#include <global.h> 24#include <global.h>
25#include <pwd.h> 25#include <pwd.h>
26#ifndef __CEXTRACT__
27# include <sproto.h> 26#include <sproto.h>
28#endif
29#include <sounds.h> 27#include <sounds.h>
30#include <living.h> 28#include <living.h>
31#include <object.h> 29#include <object.h>
32#include <spells.h> 30#include <spells.h>
33#include <skills.h> 31#include <skills.h>
34#include <newclient.h>
35 32
36#ifdef COZY_SERVER 33#include <algorithm>
37extern int same_party (partylist *a, partylist *b); 34#include <functional>
38#endif
39 35
40player * 36player *
41find_player (const char *plname) 37find_player (const char *plname)
42{ 38{
43 player *pl; 39 for_all_players (pl)
44
45 for (pl = first_player; pl != NULL; pl = pl->next)
46 {
47 if (pl->ob != NULL && !strcmp (query_name (pl->ob), plname)) 40 if (pl->ob && !strcmp (query_name (pl->ob), plname))
48 return pl; 41 return pl;
49 }; 42
50 return NULL; 43 return 0;
51}
52
53player *
54find_player_partial_name (const char *plname)
55{
56 player *pl;
57 player *found = NULL;
58 size_t namelen = strlen (plname);
59
60 for (pl = first_player; pl != NULL; pl = pl->next)
61 {
62 if ((size_t) strlen (pl->ob->name) < namelen)
63 continue;
64
65 if (!strcmp (pl->ob->name, plname))
66 return pl;
67
68 if (!strncasecmp (pl->ob->name, plname, namelen))
69 {
70 if (found)
71 return NULL;
72
73 found = pl;
74 }
75 }
76 return found;
77} 44}
78 45
79void 46void
80display_motd (const object *op) 47display_motd (const object *op)
81{ 48{
… …
85 int comp; 52 int comp;
86 int size; 53 int size;
87 54
88 sprintf (buf, "%s/%s", settings.confdir, settings.motd); 55 sprintf (buf, "%s/%s", settings.confdir, settings.motd);
89 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 56 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
90 {
91 return; 57 return;
92 } 58
93 motd[0] = '\0'; 59 motd[0] = '\0';
94 size = 0; 60 size = 0;
61
95 while (fgets (buf, MAX_BUF, fp) != NULL) 62 while (fgets (buf, MAX_BUF, fp))
96 { 63 {
97 if (*buf == '#') 64 if (*buf == '#')
98 continue; 65 continue;
66
99 strncat (motd + size, buf, HUGE_BUF - size); 67 strncat (motd + size, buf, HUGE_BUF - size);
100 size += strlen (buf); 68 size += strlen (buf);
101 } 69 }
70
102 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL); 71 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
103 close_and_delete (fp, comp); 72 close_and_delete (fp, comp);
104} 73}
105 74
106void 75void
… …
112 int comp; 81 int comp;
113 int size; 82 int size;
114 83
115 sprintf (buf, "%s/%s", settings.confdir, settings.rules); 84 sprintf (buf, "%s/%s", settings.confdir, settings.rules);
116 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 85 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
117 {
118 return; 86 return;
119 } 87
120 rules[0] = '\0'; 88 rules[0] = '\0';
121 size = 0; 89 size = 0;
90
122 while (fgets (buf, MAX_BUF, fp) != NULL) 91 while (fgets (buf, MAX_BUF, fp))
123 { 92 {
124 if (*buf == '#') 93 if (*buf == '#')
125 continue; 94 continue;
95
126 if (size + strlen (buf) >= HUGE_BUF) 96 if (size + strlen (buf) >= HUGE_BUF)
127 { 97 {
128 LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF); 98 LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);
129 break; 99 break;
130 } 100 }
101
131 strncat (rules + size, buf, HUGE_BUF - size); 102 strncat (rules + size, buf, HUGE_BUF - size);
132 size += strlen (buf); 103 size += strlen (buf);
133 } 104 }
105
134 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL); 106 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);
135 close_and_delete (fp, comp); 107 close_and_delete (fp, comp);
136} 108}
137 109
138void 110void
… …
146 int size; 118 int size;
147 119
148 sprintf (buf, "%s/%s", settings.confdir, settings.news); 120 sprintf (buf, "%s/%s", settings.confdir, settings.news);
149 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 121 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
150 return; 122 return;
123
151 news[0] = '\0'; 124 news[0] = '\0';
152 subject[0] = '\0'; 125 subject[0] = '\0';
153 size = 0; 126 size = 0;
127
154 while (fgets (buf, MAX_BUF, fp) != NULL) 128 while (fgets (buf, MAX_BUF, fp) != NULL)
155 { 129 {
156 if (*buf == '#') 130 if (*buf == '#')
157 continue; 131 continue;
132
158 if (*buf == '%') 133 if (*buf == '%')
159 { /* send one news */ 134 { /* send one news */
160 if (size > 0) 135 if (size > 0)
161 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", "%s\n%s", subject, news); /*send previously read news */ 136 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", "%s\n%s", subject, news); /*send previously read news */
162 strcpy (subject, buf + 1); 137 strcpy (subject, buf + 1);
… …
179 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 154 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
180 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news); 155 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news);
181 close_and_delete (fp, comp); 156 close_and_delete (fp, comp);
182} 157}
183 158
184int 159/* This loads the first map an puts the player on it. */
185playername_ok (const char *cp) 160static void
161set_first_map (object *op)
186{ 162{
187 /* Don't allow - or _ as first character in the name */ 163 strcpy (op->contr->maplevel, first_map_path);
188 if (*cp == '-' || *cp == '_') 164 op->x = -1;
189 return 0; 165 op->y = -1;
190
191 for (; *cp != '\0'; cp++)
192 if (!((*cp >= 'a' && *cp <= 'z') || (*cp >= 'A' && *cp <= 'Z')) && *cp != '-' && *cp != '_')
193 return 0;
194 return 1;
195} 166}
196 167
197/* This no longer sets the player map. Also, it now updates 168void
198 * all the pointers so the caller doesn't need to do that. 169player::enter_map ()
199 * Caller is responsible for setting the correct map.
200 */
201
202/* Redo this to do both get_player_ob and get_player.
203 * Hopefully this will be less bugfree and simpler.
204 * Returns the player structure. If 'p' is null,
205 * we create a new one. Otherwise, we recycle
206 * the one that is passed.
207 */
208static player *
209get_player (player *p)
210{ 170{
211 object *op = arch_to_object (get_player_archetype (NULL)); 171 object *tmp = object::create ();
212 int i;
213 172
214 if (!p) 173 EXIT_PATH (tmp) = maplevel;
215 { 174 EXIT_X (tmp) = ob->x;
216 p = new player; 175 EXIT_Y (tmp) = ob->y;
176 ob->enter_exit (tmp);
217 177
218 /* This adds the player in the linked list. There is extra 178 tmp->destroy ();
219 * complexity here because we want to add the new player at the 179}
220 * end of the list - there is in fact no compelling reason that
221 * that needs to be done except for things like output of
222 * 'who'.
223 */
224 player *tmp = first_player;
225 180
226 while (tmp != NULL && tmp->next != NULL) 181// connect the player with a specific client
227 tmp = tmp->next; 182// also changed, rationalises, and fixes some incorrect settings
228 if (tmp != NULL) 183void
229 tmp->next = p; 184player::connect (client *ns)
230 else 185{
186 this->ns = ns;
187 ns->pl = this;
188
189 next = first_player;
231 first_player = p; 190 first_player = this;
232 191
233 p->next = NULL; 192 ns->update_look = 0;
234 } 193 ns->look_position = 0;
235 194
236 /* Clears basically the entire player structure except 195 clear_los (ob);
237 * for next and socket. 196
197 /* make sure he's a player -- needed because of class change. */
198 ob->type = PLAYER; // we are paranoid
199 ob->race = ob->arch->clone.race;
200
201 if (!legal_range (ob, shoottype))
202 shoottype = range_none;
203
204 ob->carrying = sum_weight (ob);
205 link_player_skills (ob);
206
207 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
208
209 assign (title, ob->arch->clone.name);
210
211 /* can_use_shield is a new flag. However, the can_use.. seems to largely come
212 * from the class, and not race. I don't see any way to get the class information
213 * to then update this. I don't think this will actually break anything - anyone
214 * that can use armour should be able to use a shield. What this may 'break'
215 * are features new characters get, eg, if someone starts up with a Q, they
216 * should be able to use a shield. However, old Q's won't get that advantage.
238 */ 217 */
239 p->clear (); 218 if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
219 SET_FLAG (ob, FLAG_USE_SHIELD);
240 220
221 /* if it's a dragon player, set the correct title here */
222 if (is_dragon_pl (ob))
223 {
224 object *tmp, *abil = 0, *skin = 0;
225
226 shstr_cmp dragon_ability_force ("dragon_ability_force");
227 shstr_cmp dragon_skin_force ("dragon_skin_force");
228
229 for (tmp = ob->inv; tmp; tmp = tmp->below)
230 if (tmp->type == FORCE)
231 if (tmp->arch->name == dragon_ability_force)
232 abil = tmp;
233 else if (tmp->arch->name == dragon_skin_force)
234 skin = tmp;
235
236 set_dragon_name (ob, abil, skin);
237 }
238
239 CLEAR_FLAG (ob, FLAG_FRIENDLY);
240 add_friendly_object (ob);
241
242 LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
243
244 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
245
246 esrv_new_player (this, ob->weight + ob->carrying);
247
248 ob->update_stats ();
249 ns->floorbox_update ();
250
251 esrv_send_inventory (ob, ob);
252 esrv_add_spells (this, 0);
253
254 ob->activate (1);
255 enter_map ();
256
257 send_rules (ob);
258 send_news (ob);
259 display_motd (ob);
260 INVOKE_PLAYER (LOGIN, this);
261}
262
263void
264player::disconnect ()
265{
266 if (ob)
267 ob->deactivate (1);
268
269 //TODO: don't be so harsh and destroy :)
270 if (ns)
271 {
272 if (enable_save)
273 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
274
275 client *ns = this->ns;
276 ns->send_packet ("goodbye");
277 ns->flush ();
278 ns->pl = 0;
279 this->ns = 0;
280
281 ns->destroy ();
282 destroy ();
283 }
284}
285
286// the need for this function can be explained
287// by load_object not returning the object
288void
289player::set_object (object *op)
290{
291 ob = op;
292 ob->contr = this; /* this aren't yet in archetype */
293
294 ob->speed_left = 0.5;
295 ob->speed = 1.0;
296 ob->direction = 5; /* So player faces south */
297 ob->stats.wc = 2;
298 ob->run_away = 25; /* Then we panick... */
299
300 set_first_map (ob);
301 enter_map ();
302
303 ob->roll_stats ();
304}
305
306player::player ()
307{
241 /* There are some elements we want initialized to non zero value - 308 /* There are some elements we want initialized to non zero value -
242 * we deal with that below this point. 309 * we deal with that below this point.
243 */ 310 */
244 p->party = NULL;
245 p->outputs_sync = 16; /* Every 2 seconds */ 311 outputs_sync = 16; /* Every 2 seconds */
246 p->outputs_count = 8; /* Keeps present behaviour */ 312 outputs_count = 8; /* Keeps present behaviour */
247 p->unapply = unapply_nochoice; 313 unapply = unapply_nochoice;
248 p->Swap_First = -1;
249 314
250#ifdef AUTOSAVE
251 p->last_save_tick = 9999999;
252#endif
253
254 strcpy (p->savebed_map, first_map_path); /* Init. respawn position */ 315 assign (savebed_map, first_map_path); /* Init. respawn position */
255 316
256 op->contr = p; /* this aren't yet in archetype */
257 p->ob = op;
258 op->speed_left = 0.5;
259 op->speed = 1.0;
260 op->direction = 5; /* So player faces south */
261 op->stats.wc = 2;
262 op->run_away = 25; /* Then we panick... */
263 p->socket.monitor_spells = 0; /* Needed because esrv_update_spells( ) gets called by roll_stats */
264
265 roll_stats (op);
266 p->state = ST_ROLL_STAT;
267 clear_los (op);
268
269 p->gen_sp_armour = 10; 317 gen_sp_armour = 10;
270 p->last_speed = -1; 318 last_speed = -1;
271 p->shoottype = range_none; 319 shoottype = range_none;
272 p->bowtype = bow_normal; 320 bowtype = bow_normal;
273 p->petmode = pet_normal; 321 petmode = pet_normal;
274 p->listening = 10; 322 listening = 10;
275 p->usekeys = containers; 323 usekeys = containers;
276 p->last_weapon_sp = -1; 324 last_weapon_sp = -1;
277 p->peaceful = 1; /* default peaceful */ 325 peaceful = 1; /* default peaceful */
278 p->do_los = 1; 326 do_los = 1;
279 p->explore = 0;
280 p->no_shout = 0; /* default can shout */
281
282 assign (p->title, op->arch->clone.name);
283 op->race = op->arch->clone.race;
284
285 CLEAR_FLAG (op, FLAG_READY_SKILL);
286 327
287 /* we need to clear these to -1 and not zero - otherwise, 328 /* we need to clear these to -1 and not zero - otherwise,
288 * if a player quits and starts a new character, we wont 329 * if a player quits and starts a new character, we wont
289 * send new values to the client, as things like exp start 330 * send new values to the client, as things like exp start
290 * at zero. 331 * at zero.
291 */ 332 */
292 for (i = 0; i < NUM_SKILLS; i++) 333 for (int i = 0; i < NUM_SKILLS; i++)
293 {
294 p->last_skill_exp[i] = -1; 334 last_skill_exp[i] = -1;
295 p->last_skill_ob[i] = NULL; 335
296 }
297 for (i = 0; i < NROFATTACKS; i++) 336 for (int i = 0; i < NROFATTACKS; i++)
298 {
299 p->last_resist[i] = -1; 337 last_resist[i] = -1;
300 } 338
301 p->last_stats.exp = -1; 339 last_stats.exp = -1;
302 p->last_weight = (uint32) - 1; 340 last_weight = (uint32) - 1;
303
304 p->socket.update_look = 0;
305 p->socket.look_position = 0;
306 return p;
307} 341}
308 342
309/* This loads the first map an puts the player on it. */ 343void
310static void 344player::do_destroy ()
311set_first_map (object *op)
312{ 345{
313 strcpy (op->contr->maplevel, first_map_path); 346 disconnect ();
314 op->x = -1;
315 op->y = -1;
316 enter_exit (op, NULL);
317}
318 347
348 save (false);
349 enable_save = false;
350
351 attachable::do_destroy ();
352
353 terminate_all_pets (ob);
354
355 if (first_player != this)
356 {
357 player *prev = first_player;
358
359 while (prev && prev->next && prev->next != this)
360 prev = prev->next;
361
362 if (prev->next != this)
363 {
364 LOG (llevError, "Free_player: Can't find previous player.\n");
365 abort ();
366 }
367
368 prev->next = next;
369 }
370 else
371 first_player = next;
372
373 if (ob)
374 {
375 ob->destroy_inv (false);
376 ob->destroy ();
377 }
378}
379
380player::~player ()
381{
382 /* Clear item stack */
383 free (stack_items);
384}
385
319/* Tries to add player on the connection passwd in ns. 386/* Tries to add player on the connection passed in ns.
320 * All we can really get in this is some settings like host and display 387 * All we can really get in this is some settings like host and display
321 * mode. 388 * mode.
322 */ 389 */
323
324int
325add_player (client_socket * ns)
326{
327 player *p; 390player *
391player::create ()
392{
393 player *pl = new player;
328 394
329 p = get_player (NULL); 395 pl->set_object (arch_to_object (get_player_archetype (0)));
330 p->socket = *ns;
331 p->socket.faces_sent = (uint8 *) malloc (p->socket.faces_sent_len * sizeof (*p->socket.faces_sent));
332 396
333 if (p->socket.faces_sent == NULL)
334 fatal (OUT_OF_MEMORY);
335
336 memcpy (p->socket.faces_sent, ns->faces_sent, p->socket.faces_sent_len * sizeof (*p->socket.faces_sent));
337 /* Needed because the socket we just copied over needs to be cleared.
338 * Note that this can result in a client reset if there is partial data
339 * on the uncoming socket.
340 */
341 //TODO socket copying is EVIL, do not do this
342 p->socket.inbuf_len = 0;
343 set_first_map (p->ob);
344
345 CLEAR_FLAG (p->ob, FLAG_FRIENDLY);
346 add_friendly_object (p->ob);
347 send_rules (p->ob);
348 send_news (p->ob);
349 display_motd (p->ob);
350 get_name (p->ob);
351
352 return 0; 397 return pl;
353} 398}
354 399
355/* 400/*
356 * get_player_archetype() return next player archetype from archetype 401 * get_player_archetype() return next player archetype from archetype
357 * list. Not very efficient routine, but used only creating new players. 402 * list. Not very efficient routine, but used only creating new players.
… …
366 { 411 {
367 if (at == NULL || at->next == NULL) 412 if (at == NULL || at->next == NULL)
368 at = first_archetype; 413 at = first_archetype;
369 else 414 else
370 at = at->next; 415 at = at->next;
416
371 if (at->clone.type == PLAYER) 417 if (at->clone.type == PLAYER)
372 return at; 418 return at;
419
373 if (at == start) 420 if (at == start)
374 { 421 {
375 LOG (llevError, "No Player archetypes\n"); 422 LOG (llevError, "No Player archetypes\n");
376 exit (-1); 423 exit (-1);
377 } 424 }
378 } 425 }
379} 426}
380 427
381
382object * 428object *
383get_nearest_player (object *mon) 429get_nearest_player (object *mon)
384{ 430{
385 object *op = NULL; 431 object *op = NULL;
386 player *pl = NULL;
387 objectlink *ol; 432 objectlink *ol;
388 unsigned lastdist; 433 unsigned lastdist;
389 rv_vector rv; 434 rv_vector rv;
390 435
391 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 436 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)
… …
423 { 468 {
424 op = ol->ob; 469 op = ol->ob;
425 lastdist = rv.distance; 470 lastdist = rv.distance;
426 } 471 }
427 } 472 }
428 for (pl = first_player; pl != NULL; pl = pl->next) 473
429 { 474 for_all_players (pl)
430 if (can_detect_enemy (mon, pl->ob, &rv)) 475 if (can_detect_enemy (mon, pl->ob, &rv))
431 {
432
433 if (lastdist > rv.distance) 476 if (lastdist > rv.distance)
434 { 477 {
435 op = pl->ob; 478 op = pl->ob;
436 lastdist = rv.distance; 479 lastdist = rv.distance;
437 } 480 }
438 } 481
439 }
440#if 0 482#if 0
441 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)"); 483 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");
442#endif 484#endif
443 return op; 485 return op;
444} 486}
… …
462 * circling behaviour. Unfortunately, this function is also used to determined 504 * circling behaviour. Unfortunately, this function is also used to determined
463 * if the creature should cast a spell, so returning a direction in that case 505 * if the creature should cast a spell, so returning a direction in that case
464 * is probably not a good thing. 506 * is probably not a good thing.
465 */ 507 */
466#define MAX_SPACES 50 508#define MAX_SPACES 50
467
468 509
469/* 510/*
470 * Returns the direction to the player, if valid. Returns 0 otherwise. 511 * Returns the direction to the player, if valid. Returns 0 otherwise.
471 * modified to verify there is a path to the player. Does this by stepping towards 512 * modified to verify there is a path to the player. Does this by stepping towards
472 * player and if path is blocked then see if blockage is close enough to player that 513 * player and if path is blocked then see if blockage is close enough to player that
… …
711 /* Need to set up the skill pointers */ 752 /* Need to set up the skill pointers */
712 link_player_skills (pl); 753 link_player_skills (pl);
713} 754}
714 755
715void 756void
716get_name (object *op)
717{
718 op->contr->write_buf[0] = '\0';
719 op->contr->state = ST_GET_NAME;
720 send_query (&op->contr->socket, 0, "What is your name?\n:");
721}
722
723void
724get_password (object *op)
725{
726 op->contr->write_buf[0] = '\0';
727 op->contr->state = ST_GET_PASSWORD;
728 send_query (&op->contr->socket, CS_QUERY_HIDEINPUT, "What is your password?\n:");
729}
730
731void
732play_again (object *op)
733{
734 op->contr->state = ST_PLAY_AGAIN;
735 op->chosen_skill = NULL;
736 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "Do you want to play again (a/q)?");
737 /* a bit of a hack, but there are various places early in th
738 * player creation process that a user can quit (eg, roll
739 * stats) that isn't removing the player. Taking a quick
740 * look, there are many places that call play_again without
741 * removing the player - it probably makes more sense
742 * to leave it to play_again to remove the object in all
743 * cases.
744 */
745 if (!QUERY_FLAG (op, FLAG_REMOVED))
746 op->remove ();
747 /* Need to set this to null - otherwise, it could point to garbage,
748 * and draw() doesn't check to see if the player is removed, only if
749 * the map is null or not swapped out.
750 */
751 op->map = NULL;
752}
753
754int
755receive_play_again (object *op, char key)
756{
757 if (key == 'q' || key == 'Q')
758 {
759 remove_friendly_object (op);
760 leave (op->contr, 0); /* ericserver will draw the message */
761 return 2;
762 }
763 else if (key == 'a' || key == 'A')
764 {
765 player *pl = op->contr;
766 shstr name = op->name;
767
768 op->contr = 0;
769 op->type = 0;
770 op->destroy (1);
771 pl = get_player (pl);
772 op = pl->ob;
773 add_friendly_object (op);
774 op->contr->password[0] = '~';
775 op->name = op->name_pl = 0;
776 /* Lets put a space in here */
777 new_draw_info (NDI_UNIQUE, 0, op, "\n");
778 get_name (op);
779 op->name = op->name_pl = name;
780 set_first_map (op);
781 }
782 else
783 /* user pressed something else so just ask again... */
784 play_again (op);
785
786 return 0;
787}
788
789void
790confirm_password (object *op)
791{
792
793 op->contr->write_buf[0] = '\0';
794 op->contr->state = ST_CONFIRM_PASSWORD;
795 send_query (&op->contr->socket, CS_QUERY_HIDEINPUT, "Please type your password again.\n:");
796}
797
798void
799get_party_password (object *op, partylist *party) 757get_party_password (object *op, partylist *party)
800{ 758{
801 if (party == NULL) 759 if (party == NULL)
802 { 760 {
803 LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name); 761 LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name);
804 return; 762 return;
805 } 763 }
764
806 op->contr->write_buf[0] = '\0'; 765 op->contr->write_buf[0] = '\0';
807 op->contr->state = ST_GET_PARTY_PASSWORD; 766 op->contr->ns->state = ST_GET_PARTY_PASSWORD;
808 op->contr->party_to_join = party; 767 op->contr->party_to_join = party;
809 send_query (&op->contr->socket, CS_QUERY_HIDEINPUT, "What is the password?\n:"); 768 send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
810} 769}
811
812 770
813/* This rolls four 1-6 rolls and sums the best 3 of the 4. */ 771/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
814int 772static int
815roll_stat (void) 773roll_stat (void)
816{ 774{
817 int a[4], i, j, k; 775 int a[4], i, j, k;
818 776
819 for (i = 0; i < 4; i++) 777 for (i = 0; i < 4; i++)
… …
822 for (i = 0, j = 0, k = 7; i < 4; i++) 780 for (i = 0, j = 0, k = 7; i < 4; i++)
823 if (a[i] < k) 781 if (a[i] < k)
824 k = a[i], j = i; 782 k = a[i], j = i;
825 783
826 for (i = 0, k = 0; i < 4; i++) 784 for (i = 0, k = 0; i < 4; i++)
827 {
828 if (i != j) 785 if (i != j)
829 k += a[i]; 786 k += a[i];
830 } 787
831 return k; 788 return k;
832} 789}
833 790
834void 791void
835roll_stats (object *op) 792object::roll_stats ()
836{ 793{
837 int sum = 0;
838 int i = 0, j = 0;
839 int statsort[7]; 794 int statsort [7];
840 795
841 do 796 for (;;)
842 {
843 op->stats.Str = roll_stat ();
844 op->stats.Dex = roll_stat ();
845 op->stats.Int = roll_stat ();
846 op->stats.Con = roll_stat ();
847 op->stats.Wis = roll_stat ();
848 op->stats.Pow = roll_stat ();
849 op->stats.Cha = roll_stat ();
850 sum = op->stats.Str + op->stats.Dex + op->stats.Int + op->stats.Con + op->stats.Wis + op->stats.Pow + op->stats.Cha;
851 } 797 {
852 while (sum < 82 || sum > 116); 798 int sum = 0;
799 for (int i = 7; i--; )
800 sum += statsort [i] = roll_stat ();
853 801
802 if (sum >= 82 && sum <= 116)
803 break;
804 }
805
854 /* Sort the stats so that rerolling is easier... */ 806 // Sort the stats so that rerolling is easier...
855 statsort[0] = op->stats.Str; 807 std::sort (statsort, statsort + 7, std::greater<int>());
856 statsort[1] = op->stats.Dex;
857 statsort[2] = op->stats.Int;
858 statsort[3] = op->stats.Con;
859 statsort[4] = op->stats.Wis;
860 statsort[5] = op->stats.Pow;
861 statsort[6] = op->stats.Cha;
862 808
863 /* a quick and dirty bubblesort? */
864 do
865 {
866 if (statsort[i] < statsort[i + 1])
867 {
868 j = statsort[i];
869 statsort[i] = statsort[i + 1];
870 statsort[i + 1] = j;
871 i = 0;
872 }
873 else
874 {
875 i++;
876 }
877 }
878 while (i < 6);
879
880 op->stats.Str = statsort[0]; 809 stats.Str = statsort[0];
881 op->stats.Dex = statsort[1]; 810 stats.Dex = statsort[1];
882 op->stats.Con = statsort[2]; 811 stats.Con = statsort[2];
883 op->stats.Int = statsort[3]; 812 stats.Int = statsort[3];
884 op->stats.Wis = statsort[4]; 813 stats.Wis = statsort[4];
885 op->stats.Pow = statsort[5]; 814 stats.Pow = statsort[5];
886 op->stats.Cha = statsort[6]; 815 stats.Cha = statsort[6];
887 816
888
889 op->contr->orig_stats.Str = op->stats.Str;
890 op->contr->orig_stats.Dex = op->stats.Dex;
891 op->contr->orig_stats.Int = op->stats.Int;
892 op->contr->orig_stats.Con = op->stats.Con;
893 op->contr->orig_stats.Wis = op->stats.Wis;
894 op->contr->orig_stats.Pow = op->stats.Pow;
895 op->contr->orig_stats.Cha = op->stats.Cha;
896
897 op->level = 1;
898 op->stats.exp = 0; 817 stats.exp = 0;
899 op->stats.ac = 0; 818 stats.ac = 0;
900 819
901 op->contr->levhp[1] = 9;
902 op->contr->levsp[1] = 6;
903 op->contr->levgrace[1] = 3;
904
905 fix_player (op);
906 op->stats.hp = op->stats.maxhp; 820 stats.hp = stats.maxhp;
907 op->stats.sp = op->stats.maxsp; 821 stats.sp = stats.maxsp;
908 op->stats.grace = op->stats.maxgrace; 822 stats.grace = stats.maxgrace;
823
824 if (contr)
825 {
826 contr->levhp[1] = 9;
827 contr->levsp[1] = 6;
828 contr->levgrace[1] = 3;
829
909 op->contr->orig_stats = op->stats; 830 contr->orig_stats = stats;
831 }
910} 832}
911 833
912void 834void
913Roll_Again (object *op) 835object::swap_stats (int a, int b)
914{ 836{
915 esrv_new_player (op->contr, 0); 837 int tmp = get_attr_value (&contr->orig_stats, a);
916 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, 838 set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
917 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)? "); 839 set_attr_value (&contr->orig_stats, b, tmp);
918}
919 840
920void 841 stats.Str = contr->orig_stats.Str;
921Swap_Stat (object *op, int Swap_Second) 842 stats.Dex = contr->orig_stats.Dex;
843 stats.Con = contr->orig_stats.Con;
844 stats.Int = contr->orig_stats.Int;
845 stats.Wis = contr->orig_stats.Wis;
846 stats.Pow = contr->orig_stats.Pow;
847 stats.Cha = contr->orig_stats.Cha;
848
849 //TODO: the following code looks so borked and should, at the very least,
850 // be merged with the similar code in roll_stats
851 stats.ac = 0;
852
853 level = 1;
854 stats.exp = 0;
855 stats.ac = 0;
856
857 stats.hp = stats.maxhp;
858 stats.sp = stats.maxsp;
859 stats.grace = stats.maxgrace;
860
861 if (contr)
862 {
863 contr->levhp[1] = 9;
864 contr->levsp[1] = 6;
865 contr->levgrace[1] = 3;
866
867 contr->orig_stats = stats;
868 }
869}
870
871static void
872start_info (object *op)
922{ 873{
923 signed char tmp;
924 char buf[MAX_BUF]; 874 char buf[MAX_BUF];
925 875
926 if (op->contr->Swap_First == -1) 876 sprintf (buf, "Welcome to Crossfire v%s!", VERSION);
927 {
928 new_draw_info (NDI_UNIQUE, 0, op, "How the hell did you get here?!?!!!");
929 new_draw_info (NDI_UNIQUE, 0, op, "Error in Swap_Stat code,");
930 new_draw_info (NDI_UNIQUE, 0, op, "mail korg@rdt.monash.edu.au");
931 return;
932 }
933
934 tmp = get_attr_value (&op->contr->orig_stats, op->contr->Swap_First);
935
936 set_attr_value (&op->contr->orig_stats, op->contr->Swap_First, get_attr_value (&op->contr->orig_stats, Swap_Second));
937
938 set_attr_value (&op->contr->orig_stats, Swap_Second, tmp);
939
940 sprintf (buf, "%s done\n", short_stat_name[Swap_Second]);
941 new_draw_info (NDI_UNIQUE, 0, op, buf); 877 new_draw_info (NDI_UNIQUE, 0, op, buf);
942 op->stats.Str = op->contr->orig_stats.Str; 878 //new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
943 op->stats.Dex = op->contr->orig_stats.Dex;
944 op->stats.Con = op->contr->orig_stats.Con;
945 op->stats.Int = op->contr->orig_stats.Int;
946 op->stats.Wis = op->contr->orig_stats.Wis;
947 op->stats.Pow = op->contr->orig_stats.Pow;
948 op->stats.Cha = op->contr->orig_stats.Cha;
949 op->stats.ac = 0;
950
951 op->level = 1;
952 op->stats.exp = 0;
953 op->stats.ac = 0;
954
955 op->contr->levhp[1] = 9;
956 op->contr->levsp[1] = 6;
957 op->contr->levgrace[1] = 3;
958
959 fix_player (op);
960 op->stats.hp = op->stats.maxhp;
961 op->stats.sp = op->stats.maxsp;
962 op->stats.grace = op->stats.maxgrace;
963 op->contr->orig_stats = op->stats;
964 op->contr->Swap_First = -1;
965}
966
967
968/* This code has been greatly reduced, because with set_attr_value
969 * and get_attr_value, the stats can be accessed just numeric
970 * ids. stat_trans is a table that translate the number entered
971 * into the actual stat. It is needed because the order the stats
972 * are displayed in the stat window is not the same as how
973 * the number's access that stat. The table does that translation.
974 */
975int
976key_roll_stat (object *op, char key)
977{
978 int keynum = key - '0';
979 char buf[MAX_BUF];
980 static sint8 stat_trans[] = { -1, STR, DEX, CON, INT, WIS, POW, CHA };
981
982 if (keynum > 0 && keynum <= 7)
983 {
984 if (op->contr->Swap_First == -1)
985 {
986 op->contr->Swap_First = stat_trans[keynum];
987 sprintf (buf, "%s ->", short_stat_name[stat_trans[keynum]]);
988 new_draw_info (NDI_UNIQUE, 0, op, buf); 879 //new_draw_info (NDI_UNIQUE, 0, op, " ");
989 }
990 else
991 Swap_Stat (op, stat_trans[keynum]);
992
993 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "");
994 return 1;
995 }
996 switch (key)
997 {
998 case 'n':
999 case 'N':
1000 {
1001 SET_FLAG (op, FLAG_WIZ);
1002 if (op->map == NULL)
1003 {
1004 LOG (llevError, "Map == NULL in state 2\n");
1005 break;
1006 }
1007
1008#if 0
1009 /* So that enter_exit will put us at startx/starty */
1010 op->x = -1;
1011
1012 enter_exit (op, NULL);
1013#endif
1014 SET_ANIMATION (op, 2); /* So player faces south */
1015 /* Enter exit adds a player otherwise */
1016 add_statbonus (op);
1017 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR,
1018 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n");
1019 op->contr->state = ST_CHANGE_CLASS;
1020 if (op->msg)
1021 new_draw_info (NDI_BLUE, 0, op, op->msg);
1022 return 0;
1023 }
1024 case 'y':
1025 case 'Y':
1026 roll_stats (op);
1027 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "");
1028 return 1;
1029
1030 case 'q':
1031 case 'Q':
1032 play_again (op);
1033 return 1;
1034
1035 default:
1036 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "Yes, No, Quit or 1-6. Roll again?");
1037 return 0;
1038 }
1039 return 0;
1040} 880}
1041 881
1042/* This function takes the key that is passed, and does the 882/* This function takes the key that is passed, and does the
1043 * appropriate action with it (change race, or other things). 883 * appropriate action with it (change race, or other things).
1044 * The function name is for historical reasons - now we have 884 * The function name is for historical reasons - now we have
1045 * separate race and class; this actually changes the RACE, 885 * separate race and class; this actually changes the RACE,
1046 * not the class. 886 * not the class.
1047 */ 887 */
1048
1049int 888int
1050key_change_class (object *op, char key) 889key_change_class (object *op, char key)
1051{ 890{
1052 int tmp_loop; 891 int tmp_loop;
1053 892
1054 if (key == 'q' || key == 'Q')
1055 {
1056 op->remove ();
1057 play_again (op);
1058 return 0;
1059 }
1060 if (key == 'd' || key == 'D') 893 if (key == 'd' || key == 'D')
1061 { 894 {
1062 char buf[MAX_BUF]; 895 char buf[MAX_BUF];
1063 896
1064 /* this must before then initial items are given */ 897 /* this must before then initial items are given */
… …
1069 create_treasure (tl, op, 0, 0, 0); 902 create_treasure (tl, op, 0, 0, 0);
1070 903
1071 INVOKE_PLAYER (BIRTH, op->contr); 904 INVOKE_PLAYER (BIRTH, op->contr);
1072 INVOKE_PLAYER (LOGIN, op->contr); 905 INVOKE_PLAYER (LOGIN, op->contr);
1073 906
1074 op->contr->state = ST_PLAYING; 907 op->contr->ns->state = ST_PLAYING;
1075 908
1076 if (op->msg) 909 if (op->msg)
1077 op->msg = NULL; 910 op->msg = NULL;
1078 911
1079 /* We create this now because some of the unique maps will need it 912 /* We create this now because some of the unique maps will need it
… …
1088 start_info (op); 921 start_info (op);
1089 CLEAR_FLAG (op, FLAG_WIZ); 922 CLEAR_FLAG (op, FLAG_WIZ);
1090 give_initial_items (op, op->randomitems); 923 give_initial_items (op, op->randomitems);
1091 link_player_skills (op); 924 link_player_skills (op);
1092 esrv_send_inventory (op, op); 925 esrv_send_inventory (op, op);
1093 fix_player (op); 926 op->update_stats ();
1094 927
1095 /* This moves the player to a different start map, if there 928 /* This moves the player to a different start map, if there
1096 * is one for this race 929 * is one for this race
1097 */ 930 */
1098 if (*first_map_ext_path) 931 if (*first_map_ext_path)
… …
1103 snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name); 936 snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name);
1104 tmp = object::create (); 937 tmp = object::create ();
1105 EXIT_PATH (tmp) = mapname; 938 EXIT_PATH (tmp) = mapname;
1106 EXIT_X (tmp) = op->x; 939 EXIT_X (tmp) = op->x;
1107 EXIT_Y (tmp) = op->y; 940 EXIT_Y (tmp) = op->y;
1108 enter_exit (op, tmp); /* we don't really care if it succeeded; 941 op->enter_exit (tmp); /* we don't really care if it succeeded;
1109 * if the map isn't there, then stay on the 942 * if the map isn't there, then stay on the
1110 * default initial map */ 943 * default initial map */
1111 tmp->destroy (); 944 tmp->destroy ();
1112 } 945 }
1113 else 946 else
1114 {
1115 LOG (llevDebug, "first_map_ext_path not set\n"); 947 LOG (llevDebug, "first_map_ext_path not set\n");
1116 } 948
1117 return 0; 949 return 0;
1118 } 950 }
1119 951
1120 /* Following actually changes the race - this is the default command 952 /* Following actually changes the race - this is the default command
1121 * if we don't match with one of the options above. 953 * if we don't match with one of the options above.
… …
1125 while (!tmp_loop) 957 while (!tmp_loop)
1126 { 958 {
1127 shstr name = op->name; 959 shstr name = op->name;
1128 int x = op->x, y = op->y; 960 int x = op->x, y = op->y;
1129 961
1130 remove_statbonus (op); 962 op->remove_statbonus ();
1131 op->remove (); 963 op->remove ();
1132 op->arch = get_player_archetype (op->arch); 964 op->arch = get_player_archetype (op->arch);
1133 op->arch->clone.copy_to (op); 965 op->arch->clone.copy_to (op);
1134 op->instantiate (); 966 op->instantiate ();
1135 op->stats = op->contr->orig_stats; 967 op->stats = op->contr->orig_stats;
… …
1137 op->x = x; 969 op->x = x;
1138 op->y = y; 970 op->y = y;
1139 SET_ANIMATION (op, 2); /* So player faces south */ 971 SET_ANIMATION (op, 2); /* So player faces south */
1140 insert_ob_in_map (op, op->map, op, 0); 972 insert_ob_in_map (op, op->map, op, 0);
1141 assign (op->contr->title, op->arch->clone.name); 973 assign (op->contr->title, op->arch->clone.name);
1142 add_statbonus (op); 974 op->add_statbonus ();
1143 tmp_loop = allowed_class (op); 975 tmp_loop = allowed_class (op);
1144 } 976 }
1145 977
1146 update_object (op, UP_OBJ_FACE); 978 update_object (op, UP_OBJ_FACE);
1147 esrv_update_item (UPD_FACE, op, op); 979 esrv_update_item (UPD_FACE, op, op);
1148 fix_player (op); 980 op->update_stats ();
1149 op->stats.hp = op->stats.maxhp; 981 op->stats.hp = op->stats.maxhp;
1150 op->stats.sp = op->stats.maxsp; 982 op->stats.sp = op->stats.maxsp;
1151 op->stats.grace = 0; 983 op->stats.grace = 0;
1152 984
1153 if (op->msg) 985 if (op->msg)
1154 new_draw_info (NDI_BLUE, 0, op, op->msg); 986 new_draw_info (NDI_BLUE, 0, op, op->msg);
1155 987
1156 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n"); 988 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
1157 return 0; 989 return 0;
1158} 990}
1159 991
1160int 992int
1161key_confirm_quit (object *op, char key) 993key_confirm_quit (object *op, char key)
1162{ 994{
1163 char buf[MAX_BUF];
1164
1165 if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q') 995 if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
1166 { 996 {
1167 op->contr->state = ST_PLAYING; 997 op->contr->ns->state = ST_PLAYING;
1168 new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play."); 998 new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
1169 return 1; 999 return 1;
1170 } 1000 }
1171 1001
1172 INVOKE_PLAYER (LOGOUT, op->contr); 1002 INVOKE_PLAYER (LOGOUT, op->contr);
1173 INVOKE_PLAYER (QUIT, op->contr); 1003 INVOKE_PLAYER (QUIT, op->contr);
1174 1004
1005 op->contr->enable_save = false;
1006
1175 terminate_all_pets (op); 1007 terminate_all_pets (op);
1176 leave_map (op); 1008 op->remove ();
1177 op->direction = 0; 1009 op->direction = 0;
1178 new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name); 1010 new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
1179 1011
1180 strcpy (op->contr->killer, "quit"); 1012 strcpy (op->contr->killer, "quit");
1181 check_score (op); 1013 check_score (op);
1182 op->contr->party = NULL; 1014 op->contr->party = 0;
1183 if (settings.set_title == TRUE)
1184 op->contr->own_title[0] = '\0'; 1015 op->contr->own_title[0] = '\0';
1016 op->contr->destroy ();
1185 1017
1186 if (!QUERY_FLAG (op, FLAG_WAS_WIZ))
1187 {
1188 maptile *mp, *next;
1189
1190 /* We need to hunt for any per player unique maps in memory and
1191 * get rid of them. The trailing slash in the path is intentional,
1192 * so that players named 'Ab' won't match against players 'Abe' pathname
1193 */
1194 sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
1195 for (mp = first_map; mp != NULL; mp = next)
1196 {
1197 next = mp->next;
1198 if (!strncmp (mp->path, buf, strlen (buf)))
1199 delete_map (mp);
1200 }
1201
1202 delete_character (op->name, 1);
1203 }
1204
1205 play_again (op);
1206 return 1; 1018 return 1;
1207} 1019}
1208 1020
1209void 1021void
1210flee_player (object *op) 1022flee_player (object *op)
… …
1241 { 1053 {
1242 op->enemy = NULL; 1054 op->enemy = NULL;
1243 CLEAR_FLAG (op, FLAG_SCARED); 1055 CLEAR_FLAG (op, FLAG_SCARED);
1244 return; 1056 return;
1245 } 1057 }
1058
1246 get_rangevector (op, op->enemy, &rv, 0); 1059 get_rangevector (op, op->enemy, &rv, 0);
1247 1060
1248 dir = absdir (4 + rv.direction); 1061 dir = absdir (4 + rv.direction);
1249 for (diff = 0; diff < 3; diff++) 1062 for (diff = 0; diff < 3; diff++)
1250 { 1063 {
1251 int m = 1 - (RANDOM () & 2); 1064 int m = 1 - (RANDOM () & 2);
1252 1065
1253 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op))) 1066 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
1254 {
1255 return; 1067 return;
1256 }
1257 } 1068 }
1069
1258 /* Cornered, get rid of scared */ 1070 /* Cornered, get rid of scared */
1259 CLEAR_FLAG (op, FLAG_SCARED); 1071 CLEAR_FLAG (op, FLAG_SCARED);
1260 op->enemy = NULL; 1072 op->enemy = NULL;
1261} 1073}
1262 1074
… …
1348 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1160 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1349 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1161 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1350 else 1162 else
1351 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1163 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1352 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1164 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1165
1353 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1166 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1354
1355 sprintf (putstring, "...flags: ");
1356 for (k = 0; k < 4; k++)
1357 {
1358 for (j = 0; j < 32; j++)
1359 {
1360 if ((tmp->flags[k] >> j) & 0x01)
1361 {
1362 sprintf (tmpstr, "%d ", k * 32 + j);
1363 strcat (putstring, tmpstr);
1364 }
1365 }
1366 }
1367 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1368
1369#if 0
1370 /* print the flags too */
1371 for (k = 0; k < 4; k++)
1372 {
1373 fprintf (stderr, "%d [%d] ", k, k * 32 + 31);
1374 for (j = 0; j < 32; j++)
1375 {
1376 fprintf (stderr, "%d", tmp->flags[k] >> (31 - j) & 0x01);
1377 if (!((j + 1) % 4))
1378 fprintf (stderr, " ");
1379 }
1380 fprintf (stderr, " [%d]\n", k * 32);
1381 }
1382#endif
1383 } 1167 }
1168
1384 /* philosophy: 1169 /* philosophy:
1385 * It's easy to grab an item type from a pile, as long as it's 1170 * It's easy to grab an item type from a pile, as long as it's
1386 * generic. This takes no game-time. For more detailed pickups 1171 * generic. This takes no game-time. For more detailed pickups
1387 * and selections, select-items shoul dbe used. This is a 1172 * and selections, select-items should be used. This is a
1388 * grab-as-you-run type mode that's really useful for arrows for 1173 * grab-as-you-run type mode that's really useful for arrows for
1389 * example. 1174 * example.
1390 * The drawback: right now it has no frontend, so you need to 1175 * The drawback: right now it has no frontend, so you need to
1391 * stick the bits you want into a calculator in hex mode and then 1176 * stick the bits you want into a calculator in hex mode and then
1392 * convert to decimal and then 'pickup <#> 1177 * convert to decimal and then 'pickup <#>
… …
1818 if (!dir) 1603 if (!dir)
1819 { 1604 {
1820 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1605 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1821 return 0; 1606 return 0;
1822 } 1607 }
1608
1823 if (op->type == PLAYER) 1609 if (op->type == PLAYER)
1824 bow = op->contr->ranges[range_bow]; 1610 bow = op->contr->ranges[range_bow];
1825 else 1611 else
1826 { 1612 {
1827 for (bow = op->inv; bow; bow = bow->below) 1613 for (bow = op->inv; bow; bow = bow->below)
… …
1835 { 1621 {
1836 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1622 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1837 return 0; 1623 return 0;
1838 } 1624 }
1839 } 1625 }
1626
1840 if (!bow->race || !bow->skill) 1627 if (!bow->race || !bow->skill)
1841 { 1628 {
1842 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1629 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1843 return 0; 1630 return 0;
1844 } 1631 }
… …
1846 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex]; 1633 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1847 1634
1848 /* penalize ROF for bestarrow */ 1635 /* penalize ROF for bestarrow */
1849 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow) 1636 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1850 bowspeed -= dex_bonus[op->stats.Dex] + 5; 1637 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1638
1851 if (bowspeed < 1) 1639 if (bowspeed < 1)
1852 bowspeed = 1; 1640 bowspeed = 1;
1853 1641
1854 if (arrow == NULL) 1642 if (arrow == NULL)
1855 { 1643 {
… …
1861 else 1649 else
1862 CLEAR_FLAG (op, FLAG_READY_BOW); 1650 CLEAR_FLAG (op, FLAG_READY_BOW);
1863 return 0; 1651 return 0;
1864 } 1652 }
1865 } 1653 }
1654
1866 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1655 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
1867 if (mflags & P_OUT_OF_MAP) 1656 if (mflags & P_OUT_OF_MAP)
1868 {
1869 return 0; 1657 return 0;
1870 } 1658
1871 if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW) 1659 if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW)
1872 { 1660 {
1873 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1661 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
1874 return 0; 1662 return 0;
1875 } 1663 }
… …
1881 return 0; 1669 return 0;
1882 } 1670 }
1883 1671
1884 left = arrow; /* these are arrows left to the player */ 1672 left = arrow; /* these are arrows left to the player */
1885 arrow = get_split_ob (arrow, 1); 1673 arrow = get_split_ob (arrow, 1);
1886 if (arrow == NULL) 1674 if (!arrow)
1887 { 1675 {
1888 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1676 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1889 return 0; 1677 return 0;
1890 } 1678 }
1679
1891 arrow->set_owner (op); 1680 arrow->set_owner (op);
1892 arrow->skill = bow->skill; 1681 arrow->skill = bow->skill;
1893
1894 arrow->direction = dir; 1682 arrow->direction = dir;
1895 arrow->x = sx;
1896 arrow->y = sy;
1897 1683
1898 if (op->type == PLAYER) 1684 if (op->type == PLAYER)
1899 { 1685 {
1900 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed; 1686 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1901 fix_player (op); 1687 op->update_stats ();
1902 } 1688 }
1903 1689
1904 SET_ANIMATION (arrow, arrow->direction); 1690 SET_ANIMATION (arrow, arrow->direction);
1905 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */ 1691 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1906 arrow->stats.hp = arrow->stats.dam; 1692 arrow->stats.hp = arrow->stats.dam;
1907 arrow->stats.grace = arrow->attacktype; 1693 arrow->stats.grace = arrow->attacktype;
1908 if (arrow->slaying != NULL) 1694 if (arrow->slaying != NULL)
1909 arrow->spellarg = strdup_local (arrow->slaying); 1695 arrow->spellarg = strdup (arrow->slaying);
1910 1696
1911 /* Note that this was different for monsters - they got their level 1697 /* Note that this was different for monsters - they got their level
1912 * added to the damage. I think the strength bonus is more proper. 1698 * added to the damage. I think the strength bonus is more proper.
1913 */ 1699 */
1914 1700
… …
1916 1702
1917 /* update the speed */ 1703 /* update the speed */
1918 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 1704 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1919 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0; 1705 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1920 1706
1921 if (arrow->speed < 1.0) 1707 arrow->set_speed (max (arrow->speed, 1.0));
1922 arrow->speed = 1.0;
1923 update_ob_speed (arrow);
1924 arrow->speed_left = 0; 1708 arrow->speed_left = 0;
1925 1709
1926 if (op->type == PLAYER) 1710 if (op->type == PLAYER)
1927 { 1711 {
1928 arrow->stats.wc = 20 - bow->magic - arrow->magic - 1712 arrow->stats.wc = 20 - bow->magic - arrow->magic -
… …
1938 } 1722 }
1939 1723
1940 if (arrow->attacktype == AT_PHYSICAL) 1724 if (arrow->attacktype == AT_PHYSICAL)
1941 arrow->attacktype |= bow->attacktype; 1725 arrow->attacktype |= bow->attacktype;
1942 1726
1943 if (bow->slaying != NULL) 1727 if (bow->slaying)
1944 arrow->slaying = bow->slaying; 1728 arrow->slaying = bow->slaying;
1945 1729
1946 arrow->map = m;
1947 arrow->move_type = MOVE_FLY_LOW; 1730 arrow->move_type = MOVE_FLY_LOW;
1948 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1731 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1949 1732
1950 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1733 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1951 insert_ob_in_map (arrow, m, op, 0); 1734 m->insert (arrow, sx, sy, op);
1952 1735
1953 if (!arrow->destroyed ()) 1736 if (!arrow->destroyed ())
1954 move_arrow (arrow); 1737 move_arrow (arrow);
1955 1738
1956 if (op->type == PLAYER) 1739 if (op->type == PLAYER)
… …
1982 } 1765 }
1983 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1766 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1984 { 1767 {
1985 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1768 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1986 wcmod = -1; 1769 wcmod = -1;
1770
1987 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); 1771 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1988 } 1772 }
1989 else if (op->contr->bowtype == bow_threewide) 1773 else if (op->contr->bowtype == bow_threewide)
1990 { 1774 {
1991 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1775 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
… …
2061 1845
2062 if (item->arch) 1846 if (item->arch)
2063 { 1847 {
2064 CLEAR_FLAG (item, FLAG_ANIMATE); 1848 CLEAR_FLAG (item, FLAG_ANIMATE);
2065 item->face = item->arch->clone.face; 1849 item->face = item->arch->clone.face;
2066 item->speed = 0; 1850 item->set_speed (0);
2067 update_ob_speed (item);
2068 } 1851 }
1852
2069 if ((tmp = is_player_inv (item))) 1853 if ((tmp = item->in_player ()))
2070 esrv_update_item (UPD_ANIM, tmp, item); 1854 esrv_update_item (UPD_ANIM, tmp, item);
2071 } 1855 }
2072 } 1856 }
2073 else if (item->type == ROD || item->type == HORN) 1857 else if (item->type == ROD || item->type == HORN)
2074 {
2075 drain_rod_charge (item); 1858 drain_rod_charge (item);
2076 }
2077 } 1859 }
2078} 1860}
2079 1861
2080/* Received a fire command for the player - go and do it. 1862/* Received a fire command for the player - go and do it.
2081 */ 1863 */
… …
2224 * 0 otherwise 2006 * 0 otherwise
2225 */ 2007 */
2226static int 2008static int
2227player_attack_door (object *op, object *door) 2009player_attack_door (object *op, object *door)
2228{ 2010{
2229
2230 /* If its a door, try to find a use a key. If we do destroy the door, 2011 /* If its a door, try to find a use a key. If we do destroy the door,
2231 * might as well return immediately as there is nothing more to do - 2012 * might as well return immediately as there is nothing more to do -
2232 * otherwise, we fall through to the rest of the code. 2013 * otherwise, we fall through to the rest of the code.
2233 */ 2014 */
2234 object *key = find_key (op, op, door); 2015 object *key = find_key (op, op, door);
… …
2272 * It should keep the code cleaner. 2053 * It should keep the code cleaner.
2273 * When this is called, the players direction has been updated 2054 * When this is called, the players direction has been updated
2274 * (taking into account confusion.) The player is also actually 2055 * (taking into account confusion.) The player is also actually
2275 * going to try and move (not fire weapons). 2056 * going to try and move (not fire weapons).
2276 */ 2057 */
2277
2278void 2058void
2279move_player_attack (object *op, int dir) 2059move_player_attack (object *op, int dir)
2280{ 2060{
2281 object *tmp, *mon; 2061 object *tmp, *mon;
2282 sint16 nx, ny; 2062 sint16 nx, ny;
… …
2284 maptile *m; 2064 maptile *m;
2285 2065
2286 nx = freearr_x[dir] + op->x; 2066 nx = freearr_x[dir] + op->x;
2287 ny = freearr_y[dir] + op->y; 2067 ny = freearr_y[dir] + op->y;
2288 2068
2289 on_battleground = op_on_battleground (op, NULL, NULL); 2069 on_battleground = op_on_battleground (op, 0, 0);
2290 2070
2291 /* If braced, or can't move to the square, and it is not out of the 2071 /* If braced, or can't move to the square, and it is not out of the
2292 * map, attack it. Note order of if statement is important - don't 2072 * map, attack it. Note order of if statement is important - don't
2293 * want to be calling move_ob if braced, because move_ob will move the 2073 * want to be calling move_ob if braced, because move_ob will move the
2294 * player. This is a pretty nasty hack, because if we could 2074 * player. This is a pretty nasty hack, because if we could
… …
2306 return; /* Don't think this should happen */ 2086 return; /* Don't think this should happen */
2307 } 2087 }
2308 else 2088 else
2309 m = op->map; 2089 m = op->map;
2310 2090
2311 if ((tmp = get_map_ob (m, nx, ny)) == NULL) 2091 if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)
2312 { 2092 {
2313 /* LOG(llevError,"player_move_attack: get_map_ob returns NULL, but player can not more there.\n"); */ 2093 /* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2314 return; 2094 return;
2315 } 2095 }
2316 2096
2317 mon = NULL; 2097 mon = 0;
2318 /* Go through all the objects, and find ones of interest. Only stop if 2098 /* Go through all the objects, and find ones of interest. Only stop if
2319 * we find a monster - that is something we know we want to attack. 2099 * we find a monster - that is something we know we want to attack.
2320 * if its a door or barrel (can roll) see if there may be monsters 2100 * if its a door or barrel (can roll) see if there may be monsters
2321 * on the space 2101 * on the space
2322 */ 2102 */
2323 while (tmp != NULL) 2103 while (tmp)
2324 { 2104 {
2325 if (tmp == op) 2105 if (tmp == op)
2326 { 2106 {
2327 tmp = tmp->above; 2107 tmp = tmp->above;
2328 continue; 2108 continue;
… …
2338 mon = tmp; 2118 mon = tmp;
2339 2119
2340 tmp = tmp->above; 2120 tmp = tmp->above;
2341 } 2121 }
2342 2122
2343 if (mon == NULL) /* This happens anytime the player tries to move */ 2123 if (!mon) /* This happens anytime the player tries to move */
2344 return; /* into a wall */ 2124 return; /* into a wall */
2345 2125
2346 if (mon->head != NULL) 2126 if (mon->head)
2347 mon = mon->head; 2127 mon = mon->head;
2348 2128
2349 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 2129 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2350 if (player_attack_door (op, mon)) 2130 if (player_attack_door (op, mon))
2351 return; 2131 return;
… …
2388 * attack them either. 2168 * attack them either.
2389 */ 2169 */
2390 if ((mon->type == PLAYER || mon->enemy != op) && 2170 if ((mon->type == PLAYER || mon->enemy != op) &&
2391 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2171 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (
2392#ifdef PROHIBIT_PLAYERKILL 2172#ifdef PROHIBIT_PLAYERKILL
2393 (op->contr->peaceful 2173 (op->contr->peaceful
2394 || (mon->type == PLAYER 2174 || (mon->type == PLAYER
2395 && mon->contr-> 2175 && mon->contr->
2396 peaceful)) && 2176 peaceful)) &&
2397#else 2177#else
2398 op->contr->peaceful && 2178 op->contr->peaceful &&
2399#endif 2179#endif
2400 !on_battleground)) 2180 !on_battleground))
2401 { 2181 {
2402 if (!op->contr->braced) 2182 if (!op->contr->braced)
2403 { 2183 {
2404 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2184 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2405 (void) push_ob (mon, dir, op); 2185 (void) push_ob (mon, dir, op);
2406 } 2186 }
2407 else 2187 else
2408 {
2409 new_draw_info (0, 0, op, "You withhold your attack"); 2188 new_draw_info (0, 0, op, "You withhold your attack");
2410 } 2189
2411 if (op->contr->tmp_invis || op->hide) 2190 if (op->contr->tmp_invis || op->hide)
2412 make_visible (op); 2191 make_visible (op);
2413 } 2192 }
2414 2193
2415 /* If the object is a boulder or other rollable object, then 2194 /* If the object is a boulder or other rollable object, then
… …
2443 op->speed_left += op->speed / op->contr->weapon_sp; 2222 op->speed_left += op->speed / op->contr->weapon_sp;
2444 2223
2445 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */ 2224 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2446 } 2225 }
2447 2226
2448 skill_attack (mon, op, 0, NULL, NULL); 2227 skill_attack (mon, op, 0, 0, 0);
2449 2228
2450 /* If attacking another player, that player gets automatic 2229 /* If attacking another player, that player gets automatic
2451 * hitback, and doesn't loose luck either. 2230 * hitback, and doesn't loose luck either.
2452 * Disable hitback on the battleground or if the target is 2231 * Disable hitback on the battleground or if the target is
2453 * the wiz. 2232 * the wiz.
… …
2455 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ)) 2234 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2456 { 2235 {
2457 short luck = mon->stats.luck; 2236 short luck = mon->stats.luck;
2458 2237
2459 mon->contr->has_hit = 1; 2238 mon->contr->has_hit = 1;
2460 skill_attack (op, mon, 0, NULL, NULL); 2239 skill_attack (op, mon, 0, 0, 0);
2461 mon->stats.luck = luck; 2240 mon->stats.luck = luck;
2462 } 2241 }
2242
2463 if (action_makes_visible (op)) 2243 if (action_makes_visible (op))
2464 make_visible (op); 2244 make_visible (op);
2465 } 2245 }
2466 } /* if player should attack something */ 2246 } /* if player should attack something */
2467} 2247}
… …
2502 2282
2503 /* Add special check for newcs players and fire on - this way, the 2283 /* Add special check for newcs players and fire on - this way, the
2504 * server can handle repeat firing. 2284 * server can handle repeat firing.
2505 */ 2285 */
2506 if (op->contr->fire_on || (op->contr->run_on && pick != 0)) 2286 if (op->contr->fire_on || (op->contr->run_on && pick != 0))
2507 {
2508 op->direction = dir; 2287 op->direction = dir;
2509 }
2510 else 2288 else
2511 {
2512 op->direction = 0; 2289 op->direction = 0;
2513 } 2290
2514 /* Update how the player looks. Use the facing, so direction may 2291 /* Update how the player looks. Use the facing, so direction may
2515 * get reset to zero. This allows for full animation capabilities 2292 * get reset to zero. This allows for full animation capabilities
2516 * for players. 2293 * for players.
2517 */ 2294 */
2518 animate_object (op, op->facing); 2295 animate_object (op, op->facing);
… …
2570 2347
2571 /* call this here - we also will call this in do_ericserver, but 2348 /* call this here - we also will call this in do_ericserver, but
2572 * the players time has been increased when doericserver has been 2349 * the players time has been increased when doericserver has been
2573 * called, so we recheck it here. 2350 * called, so we recheck it here.
2574 */ 2351 */
2575 HandleClient (&op->contr->socket, op->contr); 2352 //TODO: better than handling 8 commands, use some more intelligent rate-limiting
2353 for (int rep = 8; --rep && op->contr->ns->handle_command (); )
2354 ;
2355
2576 if (op->speed_left < 0) 2356 if (op->speed_left < 0)
2577 return 0; 2357 return 0;
2578 2358
2579 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2359 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2580 { 2360 {
… …
2589 if (op->speed_left > 0) 2369 if (op->speed_left > 0)
2590 return 1; 2370 return 1;
2591 else 2371 else
2592 return 0; 2372 return 0;
2593 } 2373 }
2374
2594 return 0; 2375 return 0;
2595} 2376}
2596 2377
2597int 2378int
2598save_life (object *op) 2379save_life (object *op)
2599{ 2380{
2600 object *tmp;
2601
2602 if (!QUERY_FLAG (op, FLAG_LIFESAVE)) 2381 if (!QUERY_FLAG (op, FLAG_LIFESAVE))
2603 return 0; 2382 return 0;
2604 2383
2605 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2384 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2606 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2385 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2607 { 2386 {
2608 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2387 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);
2609 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2388 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2610 2389
… …
2618 op->stats.hp = op->stats.maxhp; 2397 op->stats.hp = op->stats.maxhp;
2619 2398
2620 if (op->stats.food < 0) 2399 if (op->stats.food < 0)
2621 op->stats.food = 999; 2400 op->stats.food = 999;
2622 2401
2623 fix_player (op); 2402 op->update_stats ();
2624 return 1; 2403 return 1;
2625 } 2404 }
2405
2626 LOG (llevError, "Error: LIFESAVE set without applied object.\n"); 2406 LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2627 CLEAR_FLAG (op, FLAG_LIFESAVE); 2407 CLEAR_FLAG (op, FLAG_LIFESAVE);
2628 enter_player_savebed (op); /* bring him home. */ 2408 enter_player_savebed (op); /* bring him home. */
2629 return 0; 2409 return 0;
2630} 2410}
… …
2639{ 2419{
2640 object *next; 2420 object *next;
2641 2421
2642 while (op) 2422 while (op)
2643 { 2423 {
2644 next = op->below; /* Make sure we have a good value, in case 2424 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2645 * we remove object 'op' 2425
2646 */
2647 if (QUERY_FLAG (op, FLAG_UNPAID)) 2426 if (QUERY_FLAG (op, FLAG_UNPAID))
2648 { 2427 {
2649 op->remove ();
2650 op->x = env->x;
2651 op->y = env->y;
2652 if (env->type == PLAYER) 2428 if (env->type == PLAYER)
2653 esrv_del_item (env->contr, op->count); 2429 esrv_del_item (env->contr, op->count);
2654 insert_ob_in_map (op, env->map, NULL, 0); 2430
2431 op->insert_at (env);
2655 } 2432 }
2656 else if (op->inv) 2433 else if (op->inv)
2657 remove_unpaid_objects (op->inv, env); 2434 remove_unpaid_objects (op->inv, env);
2435
2658 op = next; 2436 op = next;
2659 } 2437 }
2660} 2438}
2661
2662 2439
2663/* 2440/*
2664 * Returns pointer a static string containing gravestone text 2441 * Returns pointer a static string containing gravestone text
2665 * Moved from apply.c to player.c - player.c is what 2442 * Moved from apply.c to player.c - player.c is what
2666 * actually uses this function. player.c may not be quite the 2443 * actually uses this function. player.c may not be quite the
… …
2677 strcpy (buf2, " R.I.P.\n\n"); 2454 strcpy (buf2, " R.I.P.\n\n");
2678 if (op->type == PLAYER) 2455 if (op->type == PLAYER)
2679 sprintf (buf, "%s the %s\n", &op->name, op->contr->title); 2456 sprintf (buf, "%s the %s\n", &op->name, op->contr->title);
2680 else 2457 else
2681 sprintf (buf, "%s\n", &op->name); 2458 sprintf (buf, "%s\n", &op->name);
2459
2682 strncat (buf2, " ", 20 - strlen (buf) / 2); 2460 strncat (buf2, " ", 20 - strlen (buf) / 2);
2683 strcat (buf2, buf); 2461 strcat (buf2, buf);
2684 if (op->type == PLAYER) 2462 if (op->type == PLAYER)
2685 sprintf (buf, "who was in level %d when killed\n", op->level); 2463 sprintf (buf, "who was in level %d when killed\n", op->level);
2686 else 2464 else
2687 sprintf (buf, "who was in level %d when died.\n\n", op->level); 2465 sprintf (buf, "who was in level %d when died.\n\n", op->level);
2466
2688 strncat (buf2, " ", 20 - strlen (buf) / 2); 2467 strncat (buf2, " ", 20 - strlen (buf) / 2);
2689 strcat (buf2, buf); 2468 strcat (buf2, buf);
2690 if (op->type == PLAYER) 2469 if (op->type == PLAYER)
2691 { 2470 {
2692 sprintf (buf, "by %s.\n\n", op->contr->killer); 2471 sprintf (buf, "by %s.\n\n", op->contr->killer);
2693 strncat (buf2, " ", 21 - strlen (buf) / 2); 2472 strncat (buf2, " ", 21 - strlen (buf) / 2);
2694 strcat (buf2, buf); 2473 strcat (buf2, buf);
2695 } 2474 }
2475
2696 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now)); 2476 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));
2697 strncat (buf2, " ", 20 - strlen (buf) / 2); 2477 strncat (buf2, " ", 20 - strlen (buf) / 2);
2698 strcat (buf2, buf); 2478 strcat (buf2, buf);
2479
2699 return buf2; 2480 return buf2;
2700} 2481}
2701
2702
2703 2482
2704void 2483void
2705do_some_living (object *op) 2484do_some_living (object *op)
2706{ 2485{
2707 int last_food = op->stats.food; 2486 int last_food = op->stats.food;
… …
2716 const int max_grace = 1; 2495 const int max_grace = 1;
2717 2496
2718 if (op->contr->outputs_sync) 2497 if (op->contr->outputs_sync)
2719 { 2498 {
2720 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2499 for (i = 0; i < NUM_OUTPUT_BUFS; i++)
2721 if (op->contr->outputs[i].buf != NULL && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2500 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)
2722 flush_output_element (op, &op->contr->outputs[i]); 2501 flush_output_element (op, &op->contr->outputs[i]);
2723 } 2502 }
2724 2503
2725 if (op->contr->state == ST_PLAYING) 2504 if (op->contr->ns->state == ST_PLAYING)
2726 { 2505 {
2727
2728 /* these next three if clauses make it possible to SLOW DOWN 2506 /* these next three if clauses make it possible to SLOW DOWN
2729 hp/grace/spellpoint regeneration. */ 2507 hp/grace/spellpoint regeneration. */
2730 if (op->contr->gen_hp >= 0) 2508 if (op->contr->gen_hp >= 0)
2731 gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp; 2509 gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp;
2732 else 2510 else
2733 { 2511 {
2734 gen_hp = op->stats.maxhp; 2512 gen_hp = op->stats.maxhp;
2735 rate_hp -= rate_hp / 2 * op->contr->gen_hp; 2513 rate_hp -= rate_hp / 2 * op->contr->gen_hp;
2736 } 2514 }
2515
2737 if (op->contr->gen_sp >= 0) 2516 if (op->contr->gen_sp >= 0)
2738 gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp; 2517 gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp;
2739 else 2518 else
2740 { 2519 {
2741 gen_sp = op->stats.maxsp; 2520 gen_sp = op->stats.maxsp;
2742 rate_sp -= rate_sp / 2 * op->contr->gen_sp; 2521 rate_sp -= rate_sp / 2 * op->contr->gen_sp;
2743 } 2522 }
2523
2744 if (op->contr->gen_grace >= 0) 2524 if (op->contr->gen_grace >= 0)
2745 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2525 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2746 else 2526 else
2747 { 2527 {
2748 gen_grace = op->stats.maxgrace; 2528 gen_grace = op->stats.maxgrace;
… …
2764 op->stats.food += op->contr->digestion; 2544 op->stats.food += op->contr->digestion;
2765 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2545 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2766 op->stats.food = last_food; 2546 op->stats.food = last_food;
2767 } 2547 }
2768 } 2548 }
2549
2769 if (max_sp > 1) 2550 if (max_sp > 1)
2770 { 2551 {
2771 over_sp = (gen_sp + 10) / rate_sp; 2552 over_sp = (gen_sp + 10) / rate_sp;
2772 if (over_sp > 0) 2553 if (over_sp > 0)
2773 { 2554 {
2774 if (op->stats.sp < op->stats.maxsp) 2555 if (op->stats.sp < op->stats.maxsp)
2775 { 2556 {
2776 op->stats.sp += over_sp > max_sp ? max_sp : over_sp; 2557 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2558
2777 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp)) 2559 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2778 op->stats.sp--; 2560 op->stats.sp--;
2561
2779 if (op->stats.sp > op->stats.maxsp) 2562 if (op->stats.sp > op->stats.maxsp)
2780 op->stats.sp = op->stats.maxsp; 2563 op->stats.sp = op->stats.maxsp;
2781 } 2564 }
2782 op->last_sp = 0; 2565 op->last_sp = 0;
2783 } 2566 }
2784 else 2567 else
2785 {
2786 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10); 2568 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2787 }
2788 } 2569 }
2789 else 2570 else
2790 {
2791 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10); 2571 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2792 }
2793 } 2572 }
2794 2573
2795 /* Regenerate Grace */ 2574 /* Regenerate Grace */
2796 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2575 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2797 if (--op->last_grace < 0) 2576 if (--op->last_grace < 0)
2798 { 2577 {
2799 if (op->stats.grace < op->stats.maxgrace / 2) 2578 if (op->stats.grace < op->stats.maxgrace / 2)
2800 op->stats.grace++; /* no penalty in food for regaining grace */ 2579 op->stats.grace++; /* no penalty in food for regaining grace */
2580
2801 if (max_grace > 1) 2581 if (max_grace > 1)
2802 { 2582 {
2803 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace; 2583 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;
2804 if (over_grace > 0) 2584 if (over_grace > 0)
2805 { 2585 {
… …
2833 op->stats.food += op->contr->digestion; 2613 op->stats.food += op->contr->digestion;
2834 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2614 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2835 op->stats.food = last_food; 2615 op->stats.food = last_food;
2836 } 2616 }
2837 } 2617 }
2618
2838 if (max_hp > 1) 2619 if (max_hp > 1)
2839 { 2620 {
2840 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp; 2621 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2841 if (over_hp > 0) 2622 if (over_hp > 0)
2842 { 2623 {
… …
2866 2647
2867 if (op->contr->gen_hp > 0) 2648 if (op->contr->gen_hp > 0)
2868 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2649 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2869 else 2650 else
2870 op->last_eat = 25 * (1 + bonus) / (penalty + 1); 2651 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2652
2871 /* dms do not consume food */ 2653 /* dms do not consume food */
2872 if (!QUERY_FLAG (op, FLAG_WIZ)) 2654 if (!QUERY_FLAG (op, FLAG_WIZ))
2873 op->stats.food--; 2655 op->stats.food--;
2874 } 2656 }
2875 }
2876 2657
2877 if (op->contr->state == ST_PLAYING && op->stats.food < 0 && op->stats.hp >= 0) 2658 if (op->stats.food < 0 && op->stats.hp >= 0)
2878 { 2659 {
2879 object *tmp, *flesh = NULL; 2660 object *tmp, *flesh = 0;
2880 2661
2881 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2662 for (tmp = op->inv; tmp; tmp = tmp->below)
2882 { 2663 {
2883 if (!QUERY_FLAG (tmp, FLAG_UNPAID)) 2664 if (!QUERY_FLAG (tmp, FLAG_UNPAID))
2884 {
2885 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2886 { 2665 {
2666 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2667 {
2887 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2668 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2888 manual_apply (op, tmp, 0); 2669 manual_apply (op, tmp, 0);
2889 if (op->stats.food >= 0 || op->stats.hp < 0) 2670 if (op->stats.food >= 0 || op->stats.hp < 0)
2890 break; 2671 break;
2891 } 2672 }
2892 else if (tmp->type == FLESH) 2673 else if (tmp->type == FLESH)
2893 flesh = tmp; 2674 flesh = tmp;
2894 } /* End if paid for object */ 2675 } /* End if paid for object */
2895 } /* end of for loop */ 2676 } /* end of for loop */
2677
2896 /* If player is still starving, it means they don't have any food, so 2678 /* If player is still starving, it means they don't have any food, so
2897 * eat flesh instead. 2679 * eat flesh instead.
2898 */ 2680 */
2899 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2681 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2900 { 2682 {
2901 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2683 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2902 manual_apply (op, flesh, 0); 2684 manual_apply (op, flesh, 0);
2903 } 2685 }
2904 } /* end if player is starving */ 2686 }
2905 2687
2906 while (op->stats.food < 0 && op->stats.hp > 0) 2688 while (op->stats.food < 0 && op->stats.hp >= 0)
2907 op->stats.food++, op->stats.hp--; 2689 op->stats.food++, op->stats.hp--;
2908 2690
2909 if (!op->contr->state && !QUERY_FLAG (op, FLAG_WIZ) && (op->stats.hp < 0 || op->stats.food < 0)) 2691 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2910 kill_player (op); 2692 kill_player (op);
2693 }
2911} 2694}
2912
2913
2914 2695
2915/* If the player should die (lack of hp, food, etc), we call this. 2696/* If the player should die (lack of hp, food, etc), we call this.
2916 * op is the player in jeopardy. If the player can not be saved (not 2697 * op is the player in jeopardy. If the player can not be saved (not
2917 * permadeath, no lifesave), this will take care of removing the player 2698 * permadeath, no lifesave), this will take care of removing the player
2918 * file. 2699 * file.
… …
2948 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); 2729 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");
2949 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life..."); 2730 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2950 2731
2951 /* restore player */ 2732 /* restore player */
2952 at = archetype::find ("poisoning"); 2733 at = archetype::find ("poisoning");
2953 tmp = present_arch_in_ob (at, op); 2734 if (object *tmp = present_arch_in_ob (at, op))
2954 if (tmp)
2955 { 2735 {
2956 tmp->destroy (); 2736 tmp->destroy ();
2957 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2737 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2958 } 2738 }
2959 2739
2960 at = archetype::find ("confusion"); 2740 at = archetype::find ("confusion");
2961 tmp = present_arch_in_ob (at, op); 2741 if (object *tmp = present_arch_in_ob (at, op))
2962 if (tmp)
2963 { 2742 {
2964 tmp->destroy (); 2743 tmp->destroy ();
2965 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2744 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2966 } 2745 }
2967 2746
… …
2969 op->stats.hp = op->stats.maxhp; 2748 op->stats.hp = op->stats.maxhp;
2970 if (op->stats.food <= 0) 2749 if (op->stats.food <= 0)
2971 op->stats.food = 999; 2750 op->stats.food = 999;
2972 2751
2973 /* create a bodypart-trophy to make the winner happy */ 2752 /* create a bodypart-trophy to make the winner happy */
2974 tmp = arch_to_object (archetype::find ("finger")); 2753 if (object *tmp = arch_to_object (archetype::find ("finger")))
2975 if (tmp != NULL)
2976 { 2754 {
2977 sprintf (buf, "%s's finger", &op->name); 2755 sprintf (buf, "%s's finger", &op->name);
2978 tmp->name = buf; 2756 tmp->name = buf;
2979 sprintf (buf, " This finger has been cut off %s\n" 2757 sprintf (buf, " This finger has been cut off %s\n"
2980 " the %s, when he was defeated at\n level %d by %s.\n", 2758 " the %s, when he was defeated at\n level %d by %s.\n",
2981 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2759 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2982 tmp->msg = buf; 2760 tmp->msg = buf;
2983 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2761 tmp->value = 0, tmp->material = 0, tmp->type = 0;
2984 tmp->materialname = NULL; 2762 tmp->materialname = NULL;
2985 tmp->x = op->x, tmp->y = op->y; 2763 op->insert_at (tmp, op);
2986 insert_ob_in_map (tmp, op->map, op, 0);
2987 } 2764 }
2988 2765
2989 /* teleport defeated player to new destination */ 2766 /* teleport defeated player to new destination */
2990 transfer_ob (op, x, y, 0, NULL); 2767 transfer_ob (op, x, y, 0, NULL);
2991 op->contr->braced = 0; 2768 op->contr->braced = 0;
… …
3017 op->stats.hp = op->stats.maxhp; 2794 op->stats.hp = op->stats.maxhp;
3018 return; 2795 return;
3019 } 2796 }
3020 sprintf (buf, "%s died.", &op->name); 2797 sprintf (buf, "%s died.", &op->name);
3021 } 2798 }
2799
3022 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2800 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
3023 2801
3024 /* save the map location for corpse, gravestone */ 2802 /* save the map location for corpse, gravestone */
3025 x = op->x; 2803 x = op->x;
3026 y = op->y; 2804 y = op->y;
3027 map = op->map; 2805 map = op->map;
3028 2806
3029
3030 if (settings.not_permadeth == TRUE)
3031 {
3032 /* NOT_PERMADEATH code. This basically brings the character back to 2807 /* NOT_PERMADEATH code. This basically brings the character back to
3033 * life if they are dead - it takes some exp and a random stat. 2808 * life if they are dead - it takes some exp and a random stat.
3034 * See the config.h file for a little more in depth detail about this. 2809 * See the config.h file for a little more in depth detail about this.
3035 */ 2810 */
3036 2811
3037 /* Basically two ways to go - remove a stat permanently, or just 2812 /* Basically two ways to go - remove a stat permanently, or just
3038 * make it depletion. This bunch of code deals with that aspect 2813 * make it depletion. This bunch of code deals with that aspect
3039 * of death. 2814 * of death.
3040 */ 2815 */
3041#ifndef COZY_SERVER 2816#ifndef COZY_SERVER
3042 if (settings.balanced_stat_loss) 2817 if (settings.balanced_stat_loss)
3043 { 2818 {
3044 /* If stat loss is permanent, lose one stat only. */ 2819 /* If stat loss is permanent, lose one stat only. */
3045 /* Lower level chars don't lose as many stats because they suffer 2820 /* Lower level chars don't lose as many stats because they suffer
3046 more if they do. */ 2821 more if they do. */
3047 /* Higher level characters can afford things such as potions of 2822 /* Higher level characters can afford things such as potions of
3048 restoration, or better, stat potions. So we slug them that 2823 restoration, or better, stat potions. So we slug them that
3049 little bit harder. */ 2824 little bit harder. */
3050 /* GD */ 2825 /* GD */
3051 if (settings.stat_loss_on_death) 2826 if (settings.stat_loss_on_death)
3052 num_stats_lose = 1; 2827 num_stats_lose = 1;
3053 else
3054 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
3055 }
3056 else 2828 else
3057 { 2829 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
2830 }
2831 else
3058 num_stats_lose = 1; 2832 num_stats_lose = 1;
3059 } 2833
3060 lost_a_stat = 0; 2834 lost_a_stat = 0;
3061 2835
3062 for (z = 0; z < num_stats_lose; z++) 2836 for (z = 0; z < num_stats_lose; z++)
3063 { 2837 {
3064 i = RANDOM () % NUM_STATS; 2838 i = RANDOM () % NUM_STATS;
3065 2839
3066 if (settings.stat_loss_on_death) 2840 if (settings.stat_loss_on_death)
3067 { 2841 {
3068 /* Pick a random stat and take a point off it. Tell the player 2842 /* Pick a random stat and take a point off it. Tell the player
3069 * what he lost. 2843 * what he lost.
3070 */ 2844 */
3071 change_attr_value (&(op->stats), i, -1); 2845 change_attr_value (&(op->stats), i, -1);
3072 check_stat_bounds (&(op->stats)); 2846 check_stat_bounds (&(op->stats));
3073 change_attr_value (&(op->contr->orig_stats), i, -1); 2847 change_attr_value (&(op->contr->orig_stats), i, -1);
3074 check_stat_bounds (&(op->contr->orig_stats)); 2848 check_stat_bounds (&(op->contr->orig_stats));
3075 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]); 2849 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
3076 lost_a_stat = 1; 2850 lost_a_stat = 1;
2851 }
2852 else
2853 {
2854 /* deplete a stat */
2855 archetype *deparch = archetype::find ("depletion");
2856 object *dep;
2857
2858 dep = present_arch_in_ob (deparch, op);
2859 if (!dep)
2860 {
2861 dep = arch_to_object (deparch);
2862 insert_ob_in_ob (dep, op);
3077 } 2863 }
3078 else 2864 lose_this_stat = 1;
2865 if (settings.balanced_stat_loss)
3079 { 2866 {
3080 /* deplete a stat */ 2867 /* GD */
3081 archetype *deparch = archetype::find ("depletion"); 2868 /* Get the stat that we're about to deplete. */
3082 object *dep; 2869 this_stat = get_attr_value (&(dep->stats), i);
3083 2870 if (this_stat < 0)
3084 dep = present_arch_in_ob (deparch, op);
3085 if (!dep)
3086 { 2871 {
3087 dep = arch_to_object (deparch); 2872 int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3088 insert_ob_in_ob (dep, op); 2873 int keep_chance = this_stat * this_stat;
3089 } 2874
3090 lose_this_stat = 1; 2875 /* Yes, I am paranoid. Sue me. */
3091 if (settings.balanced_stat_loss)
3092 {
3093 /* GD */
3094 /* Get the stat that we're about to deplete. */
3095 this_stat = get_attr_value (&(dep->stats), i);
3096 if (this_stat < 0) 2876 if (keep_chance < 1)
2877 keep_chance = 1;
2878
2879 /* There is a maximum depletion total per level. */
2880 if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
3097 { 2881 {
3098 int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3099 int keep_chance = this_stat * this_stat;
3100
3101 /* Yes, I am paranoid. Sue me. */
3102 if (keep_chance < 1)
3103 keep_chance = 1;
3104
3105 /* There is a maximum depletion total per level. */
3106 if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
3107 {
3108 lose_this_stat = 0; 2882 lose_this_stat = 0;
3109 /* Take loss chance vs keep chance to see if we 2883 /* Take loss chance vs keep chance to see if we
3110 retain the stat. */ 2884 retain the stat. */
3111 }
3112 else
3113 {
3114 if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
3115 lose_this_stat = 0;
3116 /* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
3117 this_stat, keep_chance, loss_chance,
3118 lose_this_stat?"LOSE":"KEEP"); */
3119 }
3120 } 2885 }
3121 }
3122
3123 if (lose_this_stat)
3124 {
3125 this_stat = get_attr_value (&(dep->stats), i);
3126 /* We could try to do something clever like find another
3127 * stat to reduce if this fails. But chances are, if
3128 * stats have been depleted to -50, all are pretty low
3129 * and should be roughly the same, so it shouldn't make a
3130 * difference.
3131 */ 2886 else
3132 if (this_stat >= -50)
3133 { 2887 {
3134 change_attr_value (&(dep->stats), i, -1); 2888 if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
3135 SET_FLAG (dep, FLAG_APPLIED);
3136 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
3137 fix_player (op);
3138 lost_a_stat = 1; 2889 lose_this_stat = 0;
2890 /* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
2891 this_stat, keep_chance, loss_chance,
2892 lose_this_stat?"LOSE":"KEEP"); */
3139 } 2893 }
3140 } 2894 }
3141 } 2895 }
2896
2897 if (lose_this_stat)
2898 {
2899 this_stat = get_attr_value (&(dep->stats), i);
2900 /* We could try to do something clever like find another
2901 * stat to reduce if this fails. But chances are, if
2902 * stats have been depleted to -50, all are pretty low
2903 * and should be roughly the same, so it shouldn't make a
2904 * difference.
2905 */
2906 if (this_stat >= -50)
2907 {
2908 change_attr_value (&(dep->stats), i, -1);
2909 SET_FLAG (dep, FLAG_APPLIED);
2910 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2911 op->update_stats ();
2912 lost_a_stat = 1;
2913 }
3142 } 2914 }
2915 }
2916 }
3143 /* If no stat lost, tell the player. */ 2917 /* If no stat lost, tell the player. */
3144 if (!lost_a_stat) 2918 if (!lost_a_stat)
3145 { 2919 {
3146 /* determine_god() seems to not work sometimes... why is this? 2920 /* determine_god() seems to not work sometimes... why is this?
3147 Should I be using something else? GD */ 2921 Should I be using something else? GD */
3148 const char *god = determine_god (op); 2922 const char *god = determine_god (op);
3149 2923
3150 if (god && (strcmp (god, "none"))) 2924 if (god && (strcmp (god, "none")))
3151 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god); 2925 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
3152 else 2926 else
3153 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you."); 2927 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
3154 } 2928 }
3155#else 2929#else
3156 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely."); 2930 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");
3157#endif 2931#endif
3158 2932
3159 /* Put a gravestone up where the character 'almost' died. List the 2933 /* Put a gravestone up where the character 'almost' died. List the
3160 * exp loss on the stone. 2934 * exp loss on the stone.
3161 */ 2935 */
3162 tmp = arch_to_object (archetype::find ("gravestone")); 2936 tmp = arch_to_object (archetype::find ("gravestone"));
3163 sprintf (buf, "%s's gravestone", &op->name); 2937 sprintf (buf, "%s's gravestone", &op->name);
3164 tmp->name = buf; 2938 tmp->name = buf;
3165 sprintf (buf, "%s's gravestones", &op->name); 2939 sprintf (buf, "%s's gravestones", &op->name);
3166 tmp->name_pl = buf; 2940 tmp->name_pl = buf;
3167 sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer); 2941 sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer);
3168 tmp->msg = buf; 2942 tmp->msg = buf;
3169 tmp->x = op->x, tmp->y = op->y; 2943 tmp->x = op->x, tmp->y = op->y;
3170 insert_ob_in_map (tmp, op->map, NULL, 0); 2944 insert_ob_in_map (tmp, op->map, NULL, 0);
3171 2945
3172 /**************************************/ 2946 /**************************************/
3173 /* */ 2947 /* */
3174 /* Subtract the experience points, */ 2948 /* Subtract the experience points, */
3175 /* if we died cause of food, give us */ 2949 /* if we died cause of food, give us */
3176 /* food, and reset HP's... */ 2950 /* food, and reset HP's... */
3177 /* */ 2951 /* */
3178 /**************************************/ 2952 /**************************************/
3179 2953
3180 /* remove any poisoning and confusion the character may be suffering. */ 2954 /* remove any poisoning and confusion the character may be suffering. */
3181 /* restore player */ 2955 /* restore player */
3182 at = archetype::find ("poisoning"); 2956 at = archetype::find ("poisoning");
3183 tmp = present_arch_in_ob (at, op); 2957 tmp = present_arch_in_ob (at, op);
3184 2958
3185 if (tmp) 2959 if (tmp)
3186 { 2960 {
3187 tmp->destroy (); 2961 tmp->destroy ();
3188 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2962 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
3189 } 2963 }
3190 2964
3191 at = archetype::find ("confusion"); 2965 at = archetype::find ("confusion");
3192 tmp = present_arch_in_ob (at, op); 2966 tmp = present_arch_in_ob (at, op);
3193 if (tmp) 2967 if (tmp)
3194 { 2968 {
3195 tmp->destroy (); 2969 tmp->destroy ();
3196 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2970 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
3197 } 2971 }
3198 2972
3199 cure_disease (op, 0); /* remove any disease */ 2973 cure_disease (op, 0); /* remove any disease */
3200 2974
3201 /*add_exp(op, (op->stats.exp * -0.20)); */ 2975 /*add_exp(op, (op->stats.exp * -0.20)); */
3202 apply_death_exp_penalty (op); 2976 apply_death_exp_penalty (op);
3203 if (op->stats.food < 100) 2977 if (op->stats.food < 100)
3204 op->stats.food = 900; 2978 op->stats.food = 900;
3205 op->stats.hp = op->stats.maxhp; 2979 op->stats.hp = op->stats.maxhp;
3206 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2980 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
3207 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2981 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
3208 2982
3209 /* 2983 /*
3210 * Check to see if the player is in a shop. IF so, then check to see if 2984 * Check to see if the player is in a shop. IF so, then check to see if
3211 * the player has any unpaid items. If so, remove them and put them back 2985 * the player has any unpaid items. If so, remove them and put them back
3212 * in the map. 2986 * in the map.
3213 */ 2987 */
3214 2988
3215 if (is_in_shop (op)) 2989 if (is_in_shop (op))
3216 remove_unpaid_objects (op->inv, op); 2990 remove_unpaid_objects (op->inv, op);
3217 2991
3218 /****************************************/ 2992 /****************************************/
3219 /* */ 2993 /* */
3220 /* Move player to his current respawn- */ 2994 /* Move player to his current respawn- */
3221 /* position (usually last savebed) */ 2995 /* position (usually last savebed) */
3222 /* */ 2996 /* */
3223 /****************************************/ 2997 /****************************************/
3224 2998
3225 enter_player_savebed (op); 2999 enter_player_savebed (op);
3226 3000
3227 /* Save the player before inserting the force to reduce 3001 /* Save the player before inserting the force to reduce
3228 * chance of abuse. 3002 * chance of abuse.
3229 */ 3003 */
3230 op->contr->braced = 0; 3004 op->contr->braced = 0;
3231 save_player (op, 1); 3005 op->contr->save ();
3232 3006
3233 /* it is possible that the player has blown something up 3007 /* it is possible that the player has blown something up
3234 * at his savebed location, and that can have long lasting 3008 * at his savebed location, and that can have long lasting
3235 * spell effects. So first see if there is a spell effect 3009 * spell effects. So first see if there is a spell effect
3236 * on the space that might harm the player. 3010 * on the space that might harm the player.
3237 */ 3011 */
3238 will_kill_again = 0; 3012 will_kill_again = 0;
3239 for (tmp = get_map_ob (op->map, op->x, op->y); tmp; tmp = tmp->above) 3013 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
3240 if (tmp->type == SPELL_EFFECT) 3014 if (tmp->type == SPELL_EFFECT)
3241 will_kill_again |= tmp->attacktype; 3015 will_kill_again |= tmp->attacktype;
3242 3016
3243 if (will_kill_again) 3017 if (will_kill_again)
3244 { 3018 {
3245 object *force; 3019 object *force;
3246 int at; 3020 int at;
3247 3021
3248 force = get_archetype (FORCE_NAME); 3022 force = get_archetype (FORCE_NAME);
3249 /* 50 ticks should be enough time for the spell to abate */ 3023 /* 50 ticks should be enough time for the spell to abate */
3250 force->speed = 0.1; 3024 force->speed = 0.1;
3251 force->speed_left = -5.0; 3025 force->speed_left = -5.0;
3252 SET_FLAG (force, FLAG_APPLIED); 3026 SET_FLAG (force, FLAG_APPLIED);
3253 for (at = 0; at < NROFATTACKS; at++) 3027 for (at = 0; at < NROFATTACKS; at++)
3254 if (will_kill_again & (1 << at)) 3028 if (will_kill_again & (1 << at))
3255 force->resist[at] = 100; 3029 force->resist[at] = 100;
3256 3030
3257 insert_ob_in_ob (force, op); 3031 insert_ob_in_ob (force, op);
3258 fix_player (op); 3032 op->update_stats ();
3259 3033
3260 } 3034 }
3261 3035
3262 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED."); 3036 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");
3263 return;
3264 } /* NOT_PERMADETH */
3265 else
3266 {
3267 /* If NOT_PERMADETH is set, then the rest of this is not reachable. This
3268 * should probably be embedded in an else statement.
3269 */
3270
3271 op->contr->party = NULL;
3272 if (settings.set_title == TRUE)
3273 op->contr->own_title[0] = '\0';
3274 new_draw_info (NDI_UNIQUE | NDI_ALL, 0, NULL, buf);
3275 check_score (op);
3276
3277 if (op->contr->ranges[range_golem])
3278 {
3279 remove_friendly_object (op->contr->ranges[range_golem]);
3280 op->contr->ranges[range_golem]->destroy ();
3281 op->contr->ranges[range_golem] = 0;
3282 }
3283
3284 loot_object (op); /* Remove some of the items for good */
3285 op->remove ();
3286 op->direction = 0;
3287
3288 if (!QUERY_FLAG (op, FLAG_WAS_WIZ) && op->stats.exp)
3289 {
3290 delete_character (op->name, 0);
3291 if (settings.resurrection == TRUE)
3292 {
3293 /* save playerfile sans equipment when player dies
3294 ** then save it as player.pl.dead so that future resurrection
3295 ** type spells will work on them nicely
3296 */
3297 delete_character (op->name, 0);
3298 op->stats.hp = op->stats.maxhp;
3299 op->stats.food = 999;
3300
3301 /* set the location of where the person will reappear when */
3302 /* maybe resurrection code should fix map also */
3303 strcpy (op->contr->maplevel, settings.emergency_mapname);
3304 if (op->map != NULL)
3305 op->map = NULL;
3306 op->x = settings.emergency_x;
3307 op->y = settings.emergency_y;
3308 save_player (op, 0);
3309 op->map = map;
3310 /* please see resurrection.c: peterm */
3311 dead_player (op);
3312 }
3313 else
3314 delete_character (op->name, 1);
3315 }
3316
3317 play_again (op);
3318
3319 /* peterm: added to create a corpse at deathsite. */
3320 tmp = arch_to_object (archetype::find ("corpse_pl"));
3321 sprintf (buf, "%s", &op->name);
3322 tmp->name = tmp->name_pl = buf;
3323 tmp->level = op->level;
3324 tmp->x = x;
3325 tmp->y = y;
3326 tmp->msg = gravestone_text (op);
3327 SET_FLAG (tmp, FLAG_UNIQUE);
3328 insert_ob_in_map (tmp, map, NULL, 0);
3329 }
3330} 3037}
3331
3332 3038
3333void 3039void
3334loot_object (object *op) 3040loot_object (object *op)
3335{ /* Grab and destroy some treasure */ 3041{ /* Grab and destroy some treasure */
3336 object *tmp, *tmp2, *next; 3042 object *tmp, *tmp2, *next;
3337 3043
3338 if (op->container) 3044 if (op->container)
3339 { /* close open sack first */
3340 esrv_apply_container (op, op->container); 3045 esrv_apply_container (op, op->container); /* close open sack first */
3341 }
3342 3046
3343 for (tmp = op->inv; tmp != NULL; tmp = next) 3047 for (tmp = op->inv; tmp; tmp = next)
3344 { 3048 {
3345 next = tmp->below; 3049 next = tmp->below;
3346 if (tmp->type == EXPERIENCE || tmp->invisible) 3050
3051 if (tmp->invisible)
3347 continue; 3052 continue;
3053
3348 tmp->remove (); 3054 tmp->remove ();
3349 tmp->x = op->x, tmp->y = op->y; 3055 tmp->x = op->x, tmp->y = op->y;
3350 if (tmp->type == CONTAINER) 3056 if (tmp->type == CONTAINER)
3351 { /* empty container to ground */ 3057 { /* empty container to ground */
3352 loot_object (tmp); 3058 loot_object (tmp);
… …
3374 */ 3080 */
3375 3081
3376void 3082void
3377fix_weight (void) 3083fix_weight (void)
3378{ 3084{
3379 player *pl; 3085 for_all_players (pl)
3380
3381 for (pl = first_player; pl != NULL; pl = pl->next)
3382 { 3086 {
3383 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 3087 int old = pl->ob->carrying, sum = sum_weight (pl->ob);
3384 3088
3385 if (old == sum) 3089 if (old == sum)
3386 continue; 3090 continue;
3387 fix_player (pl->ob); 3091 pl->ob->update_stats ();
3388 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum); 3092 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);
3389 } 3093 }
3390} 3094}
3391 3095
3392void 3096void
3393fix_luck (void) 3097fix_luck (void)
3394{ 3098{
3395 player *pl; 3099 for_all_players (pl)
3396
3397 for (pl = first_player; pl != NULL; pl = pl->next)
3398 if (!pl->ob->contr->state) 3100 if (!pl->ob->contr->ns->state)
3399 change_luck (pl->ob, 0); 3101 pl->ob->change_luck (0);
3400} 3102}
3401
3402 3103
3403/* cast_dust() - handles op throwing objects of type 'DUST'. 3104/* cast_dust() - handles op throwing objects of type 'DUST'.
3404 * This is much simpler in the new spell code - we basically 3105 * This is much simpler in the new spell code - we basically
3405 * just treat this as any other spell casting object. 3106 * just treat this as any other spell casting object.
3406 */ 3107 */
3407
3408void 3108void
3409cast_dust (object *op, object *throw_ob, int dir) 3109cast_dust (object *op, object *throw_ob, int dir)
3410{ 3110{
3411 object *skop, *spob; 3111 object *skop, *spob;
3412 3112
… …
3457 object *tmp = NULL; 3157 object *tmp = NULL;
3458 3158
3459 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3159 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3460 return 1; 3160 return 1;
3461 3161
3462 if (op->type == PLAYER)
3463 for (tmp = op->inv; tmp; tmp = tmp->below)
3464 if (tmp->type == EXPERIENCE && tmp->stats.Wis)
3465 if (QUERY_FLAG (tmp, FLAG_UNDEAD))
3466 return 1;
3467 return 0; 3162 return 0;
3468} 3163}
3469 3164
3470/* look at the surrounding terrain to determine 3165/* look at the surrounding terrain to determine
3471 * the hideability of this object. Positive levels 3166 * the hideability of this object. Positive levels
… …
3586 if (mflags & P_OUT_OF_MAP) 3281 if (mflags & P_OUT_OF_MAP)
3587 continue; 3282 continue;
3588 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y))) 3283 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
3589 continue; 3284 continue;
3590 3285
3591 for (tmp = get_map_ob (m, x, y); tmp; tmp = tmp->above) 3286 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
3592 { 3287 {
3593 if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) 3288 if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
3594 return 1; 3289 return 1;
3595 else if (tmp->type == PLAYER) 3290 else if (tmp->type == PLAYER)
3596 { 3291 {
… …
3626 if (pl->type != PLAYER) 3321 if (pl->type != PLAYER)
3627 { 3322 {
3628 LOG (llevError, "player_can_view() called for non-player object\n"); 3323 LOG (llevError, "player_can_view() called for non-player object\n");
3629 return -1; 3324 return -1;
3630 } 3325 }
3326
3631 if (!pl || !op) 3327 if (!pl || !op)
3632 return 0; 3328 return 0;
3633 3329
3634 if (op->head)
3635 {
3636 op = op->head; 3330 op = op->head_ ();
3637 } 3331
3638 get_rangevector (pl, op, &rv, 0x1); 3332 get_rangevector (pl, op, &rv, 0x1);
3639 3333
3640 /* starting with the 'head' part, lets loop 3334 /* starting with the 'head' part, lets loop
3641 * through the object and find if it has any 3335 * through the object and find if it has any
3642 * part that is in the los array but isnt on 3336 * part that is in the los array but isnt on
… …
3650 3344
3651 /* only the viewable area the player sees is updated by LOS 3345 /* only the viewable area the player sees is updated by LOS
3652 * code, so we need to restrict ourselves to that range of values 3346 * code, so we need to restrict ourselves to that range of values
3653 * for any meaningful values. 3347 * for any meaningful values.
3654 */ 3348 */
3655 if (FABS (dx) <= (pl->contr->socket.mapx / 2) && 3349 if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&
3656 FABS (dy) <= (pl->contr->socket.mapy / 2) && 3350 FABS (dy) <= (pl->contr->ns->mapy / 2) &&
3657 !pl->contr->blocked_los[dx + (pl->contr->socket.mapx / 2)][dy + (pl->contr->socket.mapy / 2)]) 3351 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3658 return 1; 3352 return 1;
3659 op = op->more; 3353 op = op->more;
3660 } 3354 }
3661 return 0; 3355 return 0;
3662} 3356}
… …
3848 { 3542 {
3849 /* forces in the treasurelist can alter the player's stats */ 3543 /* forces in the treasurelist can alter the player's stats */
3850 object *skin; 3544 object *skin;
3851 3545
3852 /* first get the dragon skin force */ 3546 /* first get the dragon skin force */
3547 shstr_cmp dragon_skin_force ("dragon_skin_force");
3853 for (skin = who->inv; skin != NULL && strcmp (skin->arch->name, "dragon_skin_force") != 0; skin = skin->below); 3548 for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)
3549 ;
3550
3854 if (skin == NULL) 3551 if (!skin)
3855 return; 3552 return;
3856 3553
3857 /* adding new spellpath attunements */ 3554 /* adding new spellpath attunements */
3858 if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned)) 3555 if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned))
3859 { 3556 {

Diff Legend

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