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.23 by root, Thu Sep 14 22:34:04 2006 UTC vs.
Revision 1.86 by root, Thu Jan 4 19:28:38 2007 UTC

… …
20 20
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#ifndef WIN32 /* ---win32 remove headers */
26# include <pwd.h> 25#include <pwd.h>
27#endif
28#ifndef __CEXTRACT__
29# include <sproto.h> 26#include <sproto.h>
30#endif
31#include <sounds.h> 27#include <sounds.h>
32#include <living.h> 28#include <living.h>
33#include <object.h> 29#include <object.h>
34#include <spells.h> 30#include <spells.h>
35#include <skills.h> 31#include <skills.h>
36#include <newclient.h>
37 32
38#ifdef COZY_SERVER 33#include <algorithm>
39extern int same_party (partylist *a, partylist *b); 34#include <functional>
40#endif
41 35
42player * 36player *
43find_player (const char *plname) 37find_player (const char *plname)
44{ 38{
45 player *pl; 39 for_all_players (pl)
46
47 for (pl = first_player; pl != NULL; pl = pl->next)
48 {
49 if (pl->ob != NULL && !strcmp (query_name (pl->ob), plname)) 40 if (pl->ob && !strcmp (query_name (pl->ob), plname))
50 return pl; 41 return pl;
51 }; 42
52 return NULL; 43 return 0;
53}
54
55player *
56find_player_partial_name (const char *plname)
57{
58 player *pl;
59 player *found = NULL;
60 size_t namelen = strlen (plname);
61
62 for (pl = first_player; pl != NULL; pl = pl->next)
63 {
64 if ((size_t) strlen (pl->ob->name) < namelen)
65 continue;
66
67 if (!strcmp (pl->ob->name, plname))
68 return pl;
69
70 if (!strncasecmp (pl->ob->name, plname, namelen))
71 {
72 if (found)
73 return NULL;
74
75 found = pl;
76 }
77 }
78 return found;
79} 44}
80 45
81void 46void
82display_motd (const object *op) 47display_motd (const object *op)
83{ 48{
… …
87 int comp; 52 int comp;
88 int size; 53 int size;
89 54
90 sprintf (buf, "%s/%s", settings.confdir, settings.motd); 55 sprintf (buf, "%s/%s", settings.confdir, settings.motd);
91 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 56 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
92 {
93 return; 57 return;
94 } 58
95 motd[0] = '\0'; 59 motd[0] = '\0';
96 size = 0; 60 size = 0;
61
97 while (fgets (buf, MAX_BUF, fp) != NULL) 62 while (fgets (buf, MAX_BUF, fp))
98 { 63 {
99 if (*buf == '#') 64 if (*buf == '#')
100 continue; 65 continue;
66
101 strncat (motd + size, buf, HUGE_BUF - size); 67 strncat (motd + size, buf, HUGE_BUF - size);
102 size += strlen (buf); 68 size += strlen (buf);
103 } 69 }
70
104 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);
105 close_and_delete (fp, comp); 72 close_and_delete (fp, comp);
106} 73}
107 74
108void 75void
… …
114 int comp; 81 int comp;
115 int size; 82 int size;
116 83
117 sprintf (buf, "%s/%s", settings.confdir, settings.rules); 84 sprintf (buf, "%s/%s", settings.confdir, settings.rules);
118 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 85 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
119 {
120 return; 86 return;
121 } 87
122 rules[0] = '\0'; 88 rules[0] = '\0';
123 size = 0; 89 size = 0;
90
124 while (fgets (buf, MAX_BUF, fp) != NULL) 91 while (fgets (buf, MAX_BUF, fp))
125 { 92 {
126 if (*buf == '#') 93 if (*buf == '#')
127 continue; 94 continue;
95
128 if (size + strlen (buf) >= HUGE_BUF) 96 if (size + strlen (buf) >= HUGE_BUF)
129 { 97 {
130 LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF); 98 LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);
131 break; 99 break;
132 } 100 }
101
133 strncat (rules + size, buf, HUGE_BUF - size); 102 strncat (rules + size, buf, HUGE_BUF - size);
134 size += strlen (buf); 103 size += strlen (buf);
135 } 104 }
105
136 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);
137 close_and_delete (fp, comp); 107 close_and_delete (fp, comp);
138} 108}
139 109
140void 110void
… …
148 int size; 118 int size;
149 119
150 sprintf (buf, "%s/%s", settings.confdir, settings.news); 120 sprintf (buf, "%s/%s", settings.confdir, settings.news);
151 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 121 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
152 return; 122 return;
123
153 news[0] = '\0'; 124 news[0] = '\0';
154 subject[0] = '\0'; 125 subject[0] = '\0';
155 size = 0; 126 size = 0;
127
156 while (fgets (buf, MAX_BUF, fp) != NULL) 128 while (fgets (buf, MAX_BUF, fp) != NULL)
157 { 129 {
158 if (*buf == '#') 130 if (*buf == '#')
159 continue; 131 continue;
132
160 if (*buf == '%') 133 if (*buf == '%')
161 { /* send one news */ 134 { /* send one news */
162 if (size > 0) 135 if (size > 0)
163 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 */
164 strcpy (subject, buf + 1); 137 strcpy (subject, buf + 1);
… …
181 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 154 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
182 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);
183 close_and_delete (fp, comp); 156 close_and_delete (fp, comp);
184} 157}
185 158
186int 159/* This loads the first map an puts the player on it. */
187playername_ok (const char *cp) 160static void
161set_first_map (object *op)
188{ 162{
189 /* Don't allow - or _ as first character in the name */ 163 op->contr->maplevel = first_map_path;
190 if (*cp == '-' || *cp == '_') 164 op->x = -1;
191 return 0; 165 op->y = -1;
192
193 for (; *cp != '\0'; cp++)
194 if (!((*cp >= 'a' && *cp <= 'z') || (*cp >= 'A' && *cp <= 'Z')) && *cp != '-' && *cp != '_')
195 return 0;
196 return 1;
197} 166}
198 167
199/* This no longer sets the player map. Also, it now updates 168void
200 * all the pointers so the caller doesn't need to do that. 169player::enter_map ()
201 * Caller is responsible for setting the correct map.
202 */
203
204/* Redo this to do both get_player_ob and get_player.
205 * Hopefully this will be less bugfree and simpler.
206 * Returns the player structure. If 'p' is null,
207 * we create a new one. Otherwise, we recycle
208 * the one that is passed.
209 */
210static player *
211get_player (player *p)
212{ 170{
213 object *op = arch_to_object (get_player_archetype (NULL)); 171 object *tmp = object::create ();
214 int i;
215 172
216 if (!p) 173 EXIT_PATH (tmp) = maplevel;
217 { 174 EXIT_X (tmp) = ob->x;
218 p = new player; 175 EXIT_Y (tmp) = ob->y;
176 ob->enter_exit (tmp);
219 177
220 /* This adds the player in the linked list. There is extra 178 tmp->destroy ();
221 * complexity here because we want to add the new player at the 179}
222 * end of the list - there is in fact no compelling reason that
223 * that needs to be done except for things like output of
224 * 'who'.
225 */
226 player *tmp = first_player;
227 180
228 while (tmp != NULL && tmp->next != NULL) 181// connect the player with a specific client
229 tmp = tmp->next; 182// also changed, rationalises, and fixes some incorrect settings
230 if (tmp != NULL) 183void
231 tmp->next = p; 184player::connect (client *ns)
232 else 185{
186 this->ns = ns;
187 ns->pl = this;
188
189 next = first_player;
233 first_player = p; 190 first_player = this;
234 191
235 p->next = NULL; 192 ns->update_look = 0;
236 } 193 ns->look_position = 0;
237 194
238 /* Clears basically the entire player structure except 195 clear_los (ob);
239 * 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.
240 */ 217 */
241 p->clear (); 218 if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
219 SET_FLAG (ob, FLAG_USE_SHIELD);
242 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_recursive ();
255 enter_map ();
256
257 send_rules (ob);
258 send_news (ob);
259 display_motd (ob);
260
261 INVOKE_PLAYER (CONNECT, this);
262 INVOKE_PLAYER (LOGIN, this);
263}
264
265void
266player::disconnect ()
267{
268 if (ob)
269 ob->deactivate_recursive ();
270
271 //TODO: don't be so harsh and destroy :)
272 if (ns)
273 {
274 if (enable_save)
275 {
276 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
277 save (true);
278 }
279
280 INVOKE_PLAYER (DISCONNECT, this);
281
282 client *ns = this->ns;
283 ns->send_packet ("goodbye");
284 ns->flush ();
285 ns->pl = 0;
286 this->ns = 0;
287
288 ns->destroy ();
289 destroy ();
290 }
291}
292
293// the need for this function can be explained
294// by load_object not returning the object
295void
296player::set_object (object *op)
297{
298 ob = op;
299 ob->contr = this; /* this aren't yet in archetype */
300
301 ob->speed_left = 0.5;
302 ob->speed = 1.0;
303 ob->direction = 5; /* So player faces south */
304 ob->stats.wc = 2;
305 ob->run_away = 25; /* Then we panick... */
306
307 ob->roll_stats ();
308}
309
310player::player ()
311{
243 /* There are some elements we want initialized to non zero value - 312 /* There are some elements we want initialised to non zero value -
244 * we deal with that below this point. 313 * we deal with that below this point.
245 */ 314 */
246 p->party = NULL;
247 p->outputs_sync = 16; /* Every 2 seconds */ 315 outputs_sync = 16; /* Every 2 seconds */
248 p->outputs_count = 8; /* Keeps present behaviour */ 316 outputs_count = 8; /* Keeps present behaviour */
249 p->unapply = unapply_nochoice; 317 unapply = unapply_nochoice;
250 p->Swap_First = -1;
251 318
252#ifdef AUTOSAVE
253 p->last_save_tick = 9999999;
254#endif
255
256 strcpy (p->savebed_map, first_map_path); /* Init. respawn position */ 319 savebed_map = first_map_path; /* Init. respawn position */
257 320
258 op->contr = p; /* this aren't yet in archetype */
259 p->ob = op;
260 op->speed_left = 0.5;
261 op->speed = 1.0;
262 op->direction = 5; /* So player faces south */
263 op->stats.wc = 2;
264 op->run_away = 25; /* Then we panick... */
265 p->socket.monitor_spells = 0; /* Needed because esrv_update_spells( ) gets called by roll_stats */
266
267 roll_stats (op);
268 p->state = ST_ROLL_STAT;
269 clear_los (op);
270
271 p->gen_sp_armour = 10; 321 gen_sp_armour = 10;
272 p->last_speed = -1; 322 last_speed = -1;
273 p->shoottype = range_none; 323 shoottype = range_none;
274 p->bowtype = bow_normal; 324 bowtype = bow_normal;
275 p->petmode = pet_normal; 325 petmode = pet_normal;
276 p->listening = 10; 326 listening = 10;
277 p->usekeys = containers; 327 usekeys = containers;
278 p->last_weapon_sp = -1; 328 last_weapon_sp = -1;
279 p->peaceful = 1; /* default peaceful */ 329 peaceful = 1; /* default peaceful */
280 p->do_los = 1; 330 do_los = 1;
281 p->explore = 0;
282 p->no_shout = 0; /* default can shout */
283
284 assign (p->title, op->arch->clone.name);
285 op->race = op->arch->clone.race;
286
287 CLEAR_FLAG (op, FLAG_READY_SKILL);
288 331
289 /* we need to clear these to -1 and not zero - otherwise, 332 /* we need to clear these to -1 and not zero - otherwise,
290 * if a player quits and starts a new character, we wont 333 * if a player quits and starts a new character, we wont
291 * send new values to the client, as things like exp start 334 * send new values to the client, as things like exp start
292 * at zero. 335 * at zero.
293 */ 336 */
294 for (i = 0; i < NUM_SKILLS; i++) 337 for (int i = 0; i < NUM_SKILLS; i++)
295 {
296 p->last_skill_exp[i] = -1; 338 last_skill_exp[i] = -1;
297 p->last_skill_ob[i] = NULL; 339
298 }
299 for (i = 0; i < NROFATTACKS; i++) 340 for (int i = 0; i < NROFATTACKS; i++)
300 {
301 p->last_resist[i] = -1; 341 last_resist[i] = -1;
302 } 342
303 p->last_stats.exp = -1; 343 last_stats.exp = -1;
304 p->last_weight = (uint32) - 1; 344 last_weight = (uint32) - 1;
305
306 p->socket.update_look = 0;
307 p->socket.look_position = 0;
308 return p;
309} 345}
310 346
311/* This loads the first map an puts the player on it. */ 347void
312static void 348player::do_destroy ()
313set_first_map (object *op)
314{ 349{
315 strcpy (op->contr->maplevel, first_map_path); 350 disconnect ();
316 op->x = -1;
317 op->y = -1;
318 enter_exit (op, NULL);
319}
320 351
352 save (false);
353 enable_save = false;
354
355 attachable::do_destroy ();
356
357 terminate_all_pets (ob);
358
359 if (first_player != this)
360 {
361 player *prev = first_player;
362
363 while (prev && prev->next && prev->next != this)
364 prev = prev->next;
365
366 if (prev->next != this)
367 {
368 LOG (llevError, "Free_player: Can't find previous player.\n");
369 abort ();
370 }
371
372 prev->next = next;
373 }
374 else
375 first_player = next;
376
377 if (ob)
378 {
379 ob->destroy_inv (false);
380 ob->destroy ();
381 }
382}
383
384player::~player ()
385{
386 /* Clear item stack */
387 free (stack_items);
388}
389
321/* Tries to add player on the connection passwd in ns. 390/* Tries to add player on the connection passed in ns.
322 * All we can really get in this is some settings like host and display 391 * All we can really get in this is some settings like host and display
323 * mode. 392 * mode.
324 */ 393 */
325
326int
327add_player (NewSocket * ns)
328{
329 player *p; 394player *
395player::create ()
396{
397 player *pl = new player;
330 398
331 p = get_player (NULL); 399 pl->set_object (arch_to_object (get_player_archetype (0)));
332 p->socket = *ns;
333 p->socket.faces_sent = (uint8 *) malloc (p->socket.faces_sent_len * sizeof (*p->socket.faces_sent));
334 if (p->socket.faces_sent == NULL)
335 fatal (OUT_OF_MEMORY);
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 p->socket.inbuf.len = 0;
342 set_first_map (p->ob); 400 set_first_map (pl->ob);
343 401
344 CLEAR_FLAG (p->ob, FLAG_FRIENDLY);
345 add_friendly_object (p->ob);
346 send_rules (p->ob);
347 send_news (p->ob);
348 display_motd (p->ob);
349 get_name (p->ob);
350 return 0; 402 return pl;
351} 403}
352 404
353/* 405/*
354 * get_player_archetype() return next player archetype from archetype 406 * get_player_archetype() return next player archetype from archetype
355 * list. Not very efficient routine, but used only creating new players. 407 * list. Not very efficient routine, but used only creating new players.
… …
364 { 416 {
365 if (at == NULL || at->next == NULL) 417 if (at == NULL || at->next == NULL)
366 at = first_archetype; 418 at = first_archetype;
367 else 419 else
368 at = at->next; 420 at = at->next;
421
369 if (at->clone.type == PLAYER) 422 if (at->clone.type == PLAYER)
370 return at; 423 return at;
424
371 if (at == start) 425 if (at == start)
372 { 426 {
373 LOG (llevError, "No Player archetypes\n"); 427 LOG (llevError, "No Player archetypes\n");
374 exit (-1); 428 exit (-1);
375 } 429 }
376 } 430 }
377} 431}
378 432
379
380object * 433object *
381get_nearest_player (object *mon) 434get_nearest_player (object *mon)
382{ 435{
383 object *op = NULL; 436 object *op = NULL;
384 player *pl = NULL;
385 objectlink *ol; 437 objectlink *ol;
386 unsigned lastdist; 438 unsigned lastdist;
387 rv_vector rv; 439 rv_vector rv;
388 440
389 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 441 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)
… …
421 { 473 {
422 op = ol->ob; 474 op = ol->ob;
423 lastdist = rv.distance; 475 lastdist = rv.distance;
424 } 476 }
425 } 477 }
426 for (pl = first_player; pl != NULL; pl = pl->next) 478
427 { 479 for_all_players (pl)
428 if (can_detect_enemy (mon, pl->ob, &rv)) 480 if (can_detect_enemy (mon, pl->ob, &rv))
429 {
430
431 if (lastdist > rv.distance) 481 if (lastdist > rv.distance)
432 { 482 {
433 op = pl->ob; 483 op = pl->ob;
434 lastdist = rv.distance; 484 lastdist = rv.distance;
435 } 485 }
436 } 486
437 }
438#if 0 487#if 0
439 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)"); 488 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");
440#endif 489#endif
441 return op; 490 return op;
442} 491}
… …
460 * circling behaviour. Unfortunately, this function is also used to determined 509 * circling behaviour. Unfortunately, this function is also used to determined
461 * if the creature should cast a spell, so returning a direction in that case 510 * if the creature should cast a spell, so returning a direction in that case
462 * is probably not a good thing. 511 * is probably not a good thing.
463 */ 512 */
464#define MAX_SPACES 50 513#define MAX_SPACES 50
465
466 514
467/* 515/*
468 * Returns the direction to the player, if valid. Returns 0 otherwise. 516 * Returns the direction to the player, if valid. Returns 0 otherwise.
469 * modified to verify there is a path to the player. Does this by stepping towards 517 * modified to verify there is a path to the player. Does this by stepping towards
470 * player and if path is blocked then see if blockage is close enough to player that 518 * player and if path is blocked then see if blockage is close enough to player that
… …
489path_to_player (object *mon, object *pl, unsigned mindiff) 537path_to_player (object *mon, object *pl, unsigned mindiff)
490{ 538{
491 rv_vector rv; 539 rv_vector rv;
492 sint16 x, y; 540 sint16 x, y;
493 int lastx, lasty, dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES, mflags, blocked; 541 int lastx, lasty, dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES, mflags, blocked;
494 mapstruct *m, *lastmap; 542 maptile *m, *lastmap;
495 543
496 get_rangevector (mon, pl, &rv, 0); 544 get_rangevector (mon, pl, &rv, 0);
497 545
498 if (rv.distance < mindiff) 546 if (rv.distance < mindiff)
499 return 0; 547 return 0;
… …
643 (op->type == ARMOUR || op->type == BOOTS || 691 (op->type == ARMOUR || op->type == BOOTS ||
644 op->type == CLOAK || op->type == HELMET || 692 op->type == CLOAK || op->type == HELMET ||
645 op->type == SHIELD || op->type == GLOVES || 693 op->type == SHIELD || op->type == GLOVES ||
646 op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 694 op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
647 { 695 {
648 remove_ob (op); 696 op->destroy ();
649 free_object (op);
650 continue; 697 continue;
651 } 698 }
652 } 699 }
653 700
654 /* This really needs to be better - we should really give 701 /* This really needs to be better - we should really give
… …
665 if (tmp->type == op->type && tmp->name == op->name) 712 if (tmp->type == op->type && tmp->name == op->name)
666 break; 713 break;
667 714
668 if (tmp) 715 if (tmp)
669 { 716 {
670 remove_ob (op); 717 op->destroy ();
671 free_object (op);
672 LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name); 718 LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name);
673 continue; 719 continue;
674 } 720 }
721
675 if (op->nrof > 1) 722 if (op->nrof > 1)
676 op->nrof = 1; 723 op->nrof = 1;
677 } 724 }
678 725
679 if (op->type == SPELLBOOK && op->inv) 726 if (op->type == SPELLBOOK && op->inv)
… …
691 CLEAR_FLAG (op, FLAG_CURSED); 738 CLEAR_FLAG (op, FLAG_CURSED);
692 CLEAR_FLAG (op, FLAG_DAMNED); 739 CLEAR_FLAG (op, FLAG_DAMNED);
693 } 740 }
694 if (op->type == SPELL) 741 if (op->type == SPELL)
695 { 742 {
696 remove_ob (op); 743 op->destroy ();
697 free_object (op);
698 continue; 744 continue;
699 } 745 }
700 else if (op->type == SKILL) 746 else if (op->type == SKILL)
701 { 747 {
702 SET_FLAG (op, FLAG_CAN_USE_SKILL); 748 SET_FLAG (op, FLAG_CAN_USE_SKILL);
… …
711 /* Need to set up the skill pointers */ 757 /* Need to set up the skill pointers */
712 link_player_skills (pl); 758 link_player_skills (pl);
713} 759}
714 760
715void 761void
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 remove_ob (op);
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->free (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) 762get_party_password (object *op, partylist *party)
800{ 763{
801 if (party == NULL) 764 if (party == NULL)
802 { 765 {
803 LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name); 766 LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name);
804 return; 767 return;
805 } 768 }
769
806 op->contr->write_buf[0] = '\0'; 770 op->contr->write_buf[0] = '\0';
807 op->contr->state = ST_GET_PARTY_PASSWORD; 771 op->contr->ns->state = ST_GET_PARTY_PASSWORD;
808 op->contr->party_to_join = party; 772 op->contr->party_to_join = party;
809 send_query (&op->contr->socket, CS_QUERY_HIDEINPUT, "What is the password?\n:"); 773 send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
810} 774}
811
812 775
813/* This rolls four 1-6 rolls and sums the best 3 of the 4. */ 776/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
814int 777static int
815roll_stat (void) 778roll_stat (void)
816{ 779{
817 int a[4], i, j, k; 780 int a[4], i, j, k;
818 781
819 for (i = 0; i < 4; i++) 782 for (i = 0; i < 4; i++)
… …
822 for (i = 0, j = 0, k = 7; i < 4; i++) 785 for (i = 0, j = 0, k = 7; i < 4; i++)
823 if (a[i] < k) 786 if (a[i] < k)
824 k = a[i], j = i; 787 k = a[i], j = i;
825 788
826 for (i = 0, k = 0; i < 4; i++) 789 for (i = 0, k = 0; i < 4; i++)
827 {
828 if (i != j) 790 if (i != j)
829 k += a[i]; 791 k += a[i];
830 } 792
831 return k; 793 return k;
832} 794}
833 795
834void 796void
835roll_stats (object *op) 797object::roll_stats ()
836{ 798{
837 int sum = 0;
838 int i = 0, j = 0;
839 int statsort[7]; 799 int statsort [7];
840 800
841 do 801 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 } 802 {
852 while (sum < 82 || sum > 116); 803 int sum = 0;
804 for (int i = 7; i--; )
805 sum += statsort [i] = roll_stat ();
853 806
807 if (sum >= 82 && sum <= 116)
808 break;
809 }
810
854 /* Sort the stats so that rerolling is easier... */ 811 // Sort the stats so that rerolling is easier...
855 statsort[0] = op->stats.Str; 812 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 813
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]; 814 stats.Str = statsort[0];
881 op->stats.Dex = statsort[1]; 815 stats.Dex = statsort[1];
882 op->stats.Con = statsort[2]; 816 stats.Con = statsort[2];
883 op->stats.Int = statsort[3]; 817 stats.Int = statsort[3];
884 op->stats.Wis = statsort[4]; 818 stats.Wis = statsort[4];
885 op->stats.Pow = statsort[5]; 819 stats.Pow = statsort[5];
886 op->stats.Cha = statsort[6]; 820 stats.Cha = statsort[6];
887 821
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; 822 stats.exp = 0;
899 op->stats.ac = 0; 823 stats.ac = 0;
900 824
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; 825 stats.hp = stats.maxhp;
907 op->stats.sp = op->stats.maxsp; 826 stats.sp = stats.maxsp;
908 op->stats.grace = op->stats.maxgrace; 827 stats.grace = stats.maxgrace;
828
829 if (contr)
830 {
831 contr->levhp[1] = 9;
832 contr->levsp[1] = 6;
833 contr->levgrace[1] = 3;
834
909 op->contr->orig_stats = op->stats; 835 contr->orig_stats = stats;
836 }
910} 837}
911 838
912void 839void
913Roll_Again (object *op) 840object::swap_stats (int a, int b)
914{ 841{
915 esrv_new_player (op->contr, 0); 842 int tmp = get_attr_value (&contr->orig_stats, a);
916 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, 843 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)? "); 844 set_attr_value (&contr->orig_stats, b, tmp);
918}
919 845
920void 846 stats.Str = contr->orig_stats.Str;
921Swap_Stat (object *op, int Swap_Second) 847 stats.Dex = contr->orig_stats.Dex;
848 stats.Con = contr->orig_stats.Con;
849 stats.Int = contr->orig_stats.Int;
850 stats.Wis = contr->orig_stats.Wis;
851 stats.Pow = contr->orig_stats.Pow;
852 stats.Cha = contr->orig_stats.Cha;
853
854 //TODO: the following code looks so borked and should, at the very least,
855 // be merged with the similar code in roll_stats
856 stats.ac = 0;
857
858 level = 1;
859 stats.exp = 0;
860 stats.ac = 0;
861
862 stats.hp = stats.maxhp;
863 stats.sp = stats.maxsp;
864 stats.grace = stats.maxgrace;
865
866 if (contr)
867 {
868 contr->levhp[1] = 9;
869 contr->levsp[1] = 6;
870 contr->levgrace[1] = 3;
871
872 contr->orig_stats = stats;
873 }
874}
875
876static void
877start_info (object *op)
922{ 878{
923 signed char tmp;
924 char buf[MAX_BUF]; 879 char buf[MAX_BUF];
925 880
926 if (op->contr->Swap_First == -1) 881 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); 882 new_draw_info (NDI_UNIQUE, 0, op, buf);
942 op->stats.Str = op->contr->orig_stats.Str; 883 //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); 884 //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} 885}
1041 886
1042/* This function takes the key that is passed, and does the 887/* This function takes the key that is passed, and does the
1043 * appropriate action with it (change race, or other things). 888 * appropriate action with it (change race, or other things).
1044 * The function name is for historical reasons - now we have 889 * The function name is for historical reasons - now we have
1045 * separate race and class; this actually changes the RACE, 890 * separate race and class; this actually changes the RACE,
1046 * not the class. 891 * not the class.
1047 */ 892 */
1048
1049int 893int
1050key_change_class (object *op, char key) 894key_change_class (object *op, char key)
1051{ 895{
1052 int tmp_loop; 896 int tmp_loop;
1053 897
1054 if (key == 'q' || key == 'Q')
1055 {
1056 remove_ob (op);
1057 play_again (op);
1058 return 0;
1059 }
1060 if (key == 'd' || key == 'D') 898 if (key == 'd' || key == 'D')
1061 { 899 {
1062 char buf[MAX_BUF]; 900 char buf[MAX_BUF];
1063 901
1064 /* this must before then initial items are given */ 902 /* this must before then initial items are given */
1065 esrv_new_player (op->contr, op->weight + op->carrying); 903 esrv_new_player (op->contr, op->weight + op->carrying);
904
1066 create_treasure (find_treasurelist ("starting_wealth"), op, 0, 0, 0); 905 treasurelist *tl = find_treasurelist ("starting_wealth");
906 if (tl)
907 create_treasure (tl, op, 0, 0, 0);
1067 908
1068 INVOKE_PLAYER (BIRTH, op->contr); 909 INVOKE_PLAYER (BIRTH, op->contr);
1069 INVOKE_PLAYER (LOGIN, op->contr); 910 INVOKE_PLAYER (LOGIN, op->contr);
1070 911
1071 op->contr->state = ST_PLAYING; 912 op->contr->ns->state = ST_PLAYING;
1072 913
1073 if (op->msg) 914 if (op->msg)
1074 op->msg = NULL; 915 op->msg = NULL;
1075 916
1076 /* We create this now because some of the unique maps will need it 917 /* We create this now because some of the unique maps will need it
… …
1085 start_info (op); 926 start_info (op);
1086 CLEAR_FLAG (op, FLAG_WIZ); 927 CLEAR_FLAG (op, FLAG_WIZ);
1087 give_initial_items (op, op->randomitems); 928 give_initial_items (op, op->randomitems);
1088 link_player_skills (op); 929 link_player_skills (op);
1089 esrv_send_inventory (op, op); 930 esrv_send_inventory (op, op);
1090 fix_player (op); 931 op->update_stats ();
1091 932
1092 /* This moves the player to a different start map, if there 933 /* This moves the player to a different start map, if there
1093 * is one for this race 934 * is one for this race
1094 */ 935 */
1095 if (*first_map_ext_path) 936 if (*first_map_ext_path)
1096 { 937 {
1097 object *tmp; 938 object *tmp;
1098 char mapname[MAX_BUF]; 939 char mapname[MAX_BUF];
1099 940
1100 snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name); 941 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name);
1101 tmp = get_object (); 942 tmp = object::create ();
1102 EXIT_PATH (tmp) = mapname; 943 EXIT_PATH (tmp) = mapname;
1103 EXIT_X (tmp) = op->x; 944 EXIT_X (tmp) = op->x;
1104 EXIT_Y (tmp) = op->y; 945 EXIT_Y (tmp) = op->y;
1105 enter_exit (op, tmp); /* we don't really care if it succeeded; 946 op->enter_exit (tmp); /* we don't really care if it succeeded;
1106 * if the map isn't there, then stay on the 947 * if the map isn't there, then stay on the
1107 * default initial map */ 948 * default initial map */
1108 free_object (tmp); 949 tmp->destroy ();
1109 } 950 }
1110 else 951 else
1111 {
1112 LOG (llevDebug, "first_map_ext_path not set\n"); 952 LOG (llevDebug, "first_map_ext_path not set\n");
1113 } 953
1114 return 0; 954 return 0;
1115 } 955 }
1116 956
1117 /* Following actually changes the race - this is the default command 957 /* Following actually changes the race - this is the default command
1118 * if we don't match with one of the options above. 958 * if we don't match with one of the options above.
… …
1122 while (!tmp_loop) 962 while (!tmp_loop)
1123 { 963 {
1124 shstr name = op->name; 964 shstr name = op->name;
1125 int x = op->x, y = op->y; 965 int x = op->x, y = op->y;
1126 966
1127 remove_statbonus (op); 967 op->remove_statbonus ();
1128 remove_ob (op); 968 op->remove ();
1129 op->arch = get_player_archetype (op->arch); 969 op->arch = get_player_archetype (op->arch);
1130 copy_object (&op->arch->clone, op); 970 op->arch->clone.copy_to (op);
1131 op->instantiate (); 971 op->instantiate ();
1132 op->stats = op->contr->orig_stats; 972 op->stats = op->contr->orig_stats;
1133 op->name = op->name_pl = name; 973 op->name = op->name_pl = name;
1134 op->x = x; 974 op->x = x;
1135 op->y = y; 975 op->y = y;
1136 SET_ANIMATION (op, 2); /* So player faces south */ 976 SET_ANIMATION (op, 2); /* So player faces south */
1137 insert_ob_in_map (op, op->map, op, 0); 977 insert_ob_in_map (op, op->map, op, 0);
1138 assign (op->contr->title, op->arch->clone.name); 978 assign (op->contr->title, op->arch->clone.name);
1139 add_statbonus (op); 979 op->add_statbonus ();
1140 tmp_loop = allowed_class (op); 980 tmp_loop = allowed_class (op);
1141 } 981 }
1142 982
1143 update_object (op, UP_OBJ_FACE); 983 update_object (op, UP_OBJ_FACE);
1144 esrv_update_item (UPD_FACE, op, op); 984 esrv_update_item (UPD_FACE, op, op);
1145 fix_player (op); 985 op->update_stats ();
1146 op->stats.hp = op->stats.maxhp; 986 op->stats.hp = op->stats.maxhp;
1147 op->stats.sp = op->stats.maxsp; 987 op->stats.sp = op->stats.maxsp;
1148 op->stats.grace = 0; 988 op->stats.grace = 0;
1149 989
1150 if (op->msg) 990 if (op->msg)
1151 new_draw_info (NDI_BLUE, 0, op, op->msg); 991 new_draw_info (NDI_BLUE, 0, op, op->msg);
1152 992
1153 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n"); 993 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
1154 return 0; 994 return 0;
1155} 995}
1156 996
1157int 997int
1158key_confirm_quit (object *op, char key) 998key_confirm_quit (object *op, char key)
1159{ 999{
1160 char buf[MAX_BUF];
1161
1162 if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q') 1000 if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
1163 { 1001 {
1164 op->contr->state = ST_PLAYING; 1002 op->contr->ns->state = ST_PLAYING;
1165 new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play."); 1003 new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
1166 return 1; 1004 return 1;
1167 } 1005 }
1168 1006
1169 INVOKE_PLAYER (LOGOUT, op->contr); 1007 INVOKE_PLAYER (LOGOUT, op->contr);
1170 INVOKE_PLAYER (QUIT, op->contr); 1008 INVOKE_PLAYER (QUIT, op->contr);
1171 1009
1010 op->contr->enable_save = false;
1011 delete_character (op->name);
1012
1172 terminate_all_pets (op); 1013 terminate_all_pets (op);
1173 leave_map (op); 1014 op->remove ();
1174 op->direction = 0; 1015 op->direction = 0;
1175 new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name); 1016 new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
1176 1017
1177 strcpy (op->contr->killer, "quit"); 1018 strcpy (op->contr->killer, "quit");
1178 check_score (op); 1019 check_score (op);
1179 op->contr->party = NULL; 1020 op->contr->party = 0;
1180 if (settings.set_title == TRUE)
1181 op->contr->own_title[0] = '\0'; 1021 op->contr->own_title[0] = '\0';
1022 op->contr->destroy ();
1182 1023
1183 if (!QUERY_FLAG (op, FLAG_WAS_WIZ))
1184 {
1185 mapstruct *mp, *next;
1186
1187 /* We need to hunt for any per player unique maps in memory and
1188 * get rid of them. The trailing slash in the path is intentional,
1189 * so that players named 'Ab' won't match against players 'Abe' pathname
1190 */
1191 sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
1192 for (mp = first_map; mp != NULL; mp = next)
1193 {
1194 next = mp->next;
1195 if (!strncmp (mp->path, buf, strlen (buf)))
1196 delete_map (mp);
1197 }
1198
1199 delete_character (op->name, 1);
1200 }
1201
1202 play_again (op);
1203 return 1; 1024 return 1;
1204} 1025}
1205 1026
1206void 1027void
1207flee_player (object *op) 1028flee_player (object *op)
… …
1238 { 1059 {
1239 op->enemy = NULL; 1060 op->enemy = NULL;
1240 CLEAR_FLAG (op, FLAG_SCARED); 1061 CLEAR_FLAG (op, FLAG_SCARED);
1241 return; 1062 return;
1242 } 1063 }
1064
1243 get_rangevector (op, op->enemy, &rv, 0); 1065 get_rangevector (op, op->enemy, &rv, 0);
1244 1066
1245 dir = absdir (4 + rv.direction); 1067 dir = absdir (4 + rv.direction);
1246 for (diff = 0; diff < 3; diff++) 1068 for (diff = 0; diff < 3; diff++)
1247 { 1069 {
1248 int m = 1 - (RANDOM () & 2); 1070 int m = 1 - (RANDOM () & 2);
1249 1071
1250 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op))) 1072 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
1251 {
1252 return; 1073 return;
1253 }
1254 } 1074 }
1075
1255 /* Cornered, get rid of scared */ 1076 /* Cornered, get rid of scared */
1256 CLEAR_FLAG (op, FLAG_SCARED); 1077 CLEAR_FLAG (op, FLAG_SCARED);
1257 op->enemy = NULL; 1078 op->enemy = NULL;
1258} 1079}
1259 1080
… …
1264 */ 1085 */
1265int 1086int
1266check_pick (object *op) 1087check_pick (object *op)
1267{ 1088{
1268 object *tmp, *next; 1089 object *tmp, *next;
1269 tag_t next_tag = 0, op_tag;
1270 int stop = 0; 1090 int stop = 0;
1271 int j, k, wvratio; 1091 int j, k, wvratio;
1272 char putstring[128], tmpstr[16]; 1092 char putstring[128], tmpstr[16];
1273 1093
1274
1275 /* if you're flying, you cna't pick up anything */ 1094 /* if you're flying, you cna't pick up anything */
1276 if (op->move_type & MOVE_FLYING) 1095 if (op->move_type & MOVE_FLYING)
1277 return 1; 1096 return 1;
1278 1097
1279 op_tag = op->count;
1280
1281 next = op->below; 1098 next = op->below;
1282 if (next)
1283 next_tag = next->count;
1284 1099
1285 /* loop while there are items on the floor that are not marked as 1100 /* loop while there are items on the floor that are not marked as
1286 * destroyed */ 1101 * destroyed */
1287 while (next && !was_destroyed (next, next_tag)) 1102 while (next && !next->destroyed ())
1288 { 1103 {
1289 tmp = next; 1104 tmp = next;
1290 next = tmp->below; 1105 next = tmp->below;
1291 if (next)
1292 next_tag = next->count;
1293 1106
1294 if (was_destroyed (op, op_tag)) 1107 if (op->destroyed ())
1295 return 0; 1108 return 0;
1296 1109
1297 if (!can_pick (op, tmp)) 1110 if (!can_pick (op, tmp))
1298 continue; 1111 continue;
1299 1112
… …
1353 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1166 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1354 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1167 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1355 else 1168 else
1356 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1169 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1357 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1170 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1171
1358 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1172 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1359
1360 sprintf (putstring, "...flags: ");
1361 for (k = 0; k < 4; k++)
1362 {
1363 for (j = 0; j < 32; j++)
1364 {
1365 if ((tmp->flags[k] >> j) & 0x01)
1366 {
1367 sprintf (tmpstr, "%d ", k * 32 + j);
1368 strcat (putstring, tmpstr);
1369 }
1370 }
1371 }
1372 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1373
1374#if 0
1375 /* print the flags too */
1376 for (k = 0; k < 4; k++)
1377 {
1378 fprintf (stderr, "%d [%d] ", k, k * 32 + 31);
1379 for (j = 0; j < 32; j++)
1380 {
1381 fprintf (stderr, "%d", tmp->flags[k] >> (31 - j) & 0x01);
1382 if (!((j + 1) % 4))
1383 fprintf (stderr, " ");
1384 }
1385 fprintf (stderr, " [%d]\n", k * 32);
1386 }
1387#endif
1388 } 1173 }
1174
1389 /* philosophy: 1175 /* philosophy:
1390 * It's easy to grab an item type from a pile, as long as it's 1176 * It's easy to grab an item type from a pile, as long as it's
1391 * generic. This takes no game-time. For more detailed pickups 1177 * generic. This takes no game-time. For more detailed pickups
1392 * and selections, select-items shoul dbe used. This is a 1178 * and selections, select-items should be used. This is a
1393 * grab-as-you-run type mode that's really useful for arrows for 1179 * grab-as-you-run type mode that's really useful for arrows for
1394 * example. 1180 * example.
1395 * The drawback: right now it has no frontend, so you need to 1181 * The drawback: right now it has no frontend, so you need to
1396 * stick the bits you want into a calculator in hex mode and then 1182 * stick the bits you want into a calculator in hex mode and then
1397 * convert to decimal and then 'pickup <#> 1183 * convert to decimal and then 'pickup <#>
… …
1431 /* question: don't pick up known-poisonous stuff? */ 1217 /* question: don't pick up known-poisonous stuff? */
1432 if (op->contr->mode & PU_FOOD) 1218 if (op->contr->mode & PU_FOOD)
1433 if (tmp->type == FOOD) 1219 if (tmp->type == FOOD)
1434 { 1220 {
1435 pick_up (op, tmp); 1221 pick_up (op, tmp);
1436 if (0)
1437 fprintf (stderr, "FOOD\n");
1438 continue; 1222 continue;
1439 } 1223 }
1224
1440 if (op->contr->mode & PU_DRINK) 1225 if (op->contr->mode & PU_DRINK)
1441 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 1226 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1442 { 1227 {
1443 pick_up (op, tmp); 1228 pick_up (op, tmp);
1444 if (0)
1445 fprintf (stderr, "DRINK\n");
1446 continue; 1229 continue;
1447 } 1230 }
1448 1231
1449 if (op->contr->mode & PU_POTION) 1232 if (op->contr->mode & PU_POTION)
1450 if (tmp->type == POTION) 1233 if (tmp->type == POTION)
1451 { 1234 {
1452 pick_up (op, tmp); 1235 pick_up (op, tmp);
1453 if (0)
1454 fprintf (stderr, "POTION\n");
1455 continue; 1236 continue;
1456 } 1237 }
1457 1238
1458 /* spellbooks, skillscrolls and normal books/scrolls */ 1239 /* spellbooks, skillscrolls and normal books/scrolls */
1459 if (op->contr->mode & PU_SPELLBOOK) 1240 if (op->contr->mode & PU_SPELLBOOK)
1460 if (tmp->type == SPELLBOOK) 1241 if (tmp->type == SPELLBOOK)
1461 { 1242 {
1462 pick_up (op, tmp); 1243 pick_up (op, tmp);
1463 if (0)
1464 fprintf (stderr, "SPELLBOOK\n");
1465 continue; 1244 continue;
1466 } 1245 }
1246
1467 if (op->contr->mode & PU_SKILLSCROLL) 1247 if (op->contr->mode & PU_SKILLSCROLL)
1468 if (tmp->type == SKILLSCROLL) 1248 if (tmp->type == SKILLSCROLL)
1469 { 1249 {
1470 pick_up (op, tmp); 1250 pick_up (op, tmp);
1471 if (0)
1472 fprintf (stderr, "SKILLSCROLL\n");
1473 continue; 1251 continue;
1474 } 1252 }
1253
1475 if (op->contr->mode & PU_READABLES) 1254 if (op->contr->mode & PU_READABLES)
1476 if (tmp->type == BOOK || tmp->type == SCROLL) 1255 if (tmp->type == BOOK || tmp->type == SCROLL)
1477 { 1256 {
1478 pick_up (op, tmp); 1257 pick_up (op, tmp);
1479 if (0)
1480 fprintf (stderr, "READABLES\n");
1481 continue; 1258 continue;
1482 } 1259 }
1483 1260
1484 /* wands/staves/rods/horns */ 1261 /* wands/staves/rods/horns */
1485 if (op->contr->mode & PU_MAGIC_DEVICE) 1262 if (op->contr->mode & PU_MAGIC_DEVICE)
1486 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 1263 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1487 { 1264 {
1488 pick_up (op, tmp); 1265 pick_up (op, tmp);
1489 if (0)
1490 fprintf (stderr, "MAGIC_DEVICE\n");
1491 continue; 1266 continue;
1492 } 1267 }
1493 1268
1494 /* pick up all magical items */ 1269 /* pick up all magical items */
1495 if (op->contr->mode & PU_MAGICAL) 1270 if (op->contr->mode & PU_MAGICAL)
1496 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1271 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1497 { 1272 {
1498 pick_up (op, tmp); 1273 pick_up (op, tmp);
1499 if (0)
1500 fprintf (stderr, "MAGICAL\n");
1501 continue; 1274 continue;
1502 } 1275 }
1503 1276
1504 if (op->contr->mode & PU_VALUABLES) 1277 if (op->contr->mode & PU_VALUABLES)
1505 { 1278 {
1506 if (tmp->type == MONEY || tmp->type == GEM) 1279 if (tmp->type == MONEY || tmp->type == GEM)
1507 { 1280 {
1508 pick_up (op, tmp); 1281 pick_up (op, tmp);
1509 if (0)
1510 fprintf (stderr, "MONEY/GEM\n");
1511 continue; 1282 continue;
1512 } 1283 }
1513 } 1284 }
1514 1285
1515 /* rings & amulets - talismans seems to be typed AMULET */ 1286 /* rings & amulets - talismans seems to be typed AMULET */
1516 if (op->contr->mode & PU_JEWELS) 1287 if (op->contr->mode & PU_JEWELS)
1517 if (tmp->type == RING || tmp->type == AMULET) 1288 if (tmp->type == RING || tmp->type == AMULET)
1518 { 1289 {
1519 pick_up (op, tmp); 1290 pick_up (op, tmp);
1291 continue;
1520 if (0) 1292 }
1521 fprintf (stderr, "JEWELS\n"); 1293
1294 /* we don't forget dragon food */
1295 if (op->contr->mode & PU_FLESH)
1296 if (tmp->type == FLESH)
1297 {
1298 pick_up (op, tmp);
1522 continue; 1299 continue;
1523 } 1300 }
1524 1301
1525 /* bows and arrows. Bows are good for selling! */ 1302 /* bows and arrows. Bows are good for selling! */
1526 if (op->contr->mode & PU_BOW) 1303 if (op->contr->mode & PU_BOW)
1527 if (tmp->type == BOW) 1304 if (tmp->type == BOW)
1528 { 1305 {
1529 pick_up (op, tmp); 1306 pick_up (op, tmp);
1530 if (0)
1531 fprintf (stderr, "BOW\n");
1532 continue; 1307 continue;
1533 } 1308 }
1309
1534 if (op->contr->mode & PU_ARROW) 1310 if (op->contr->mode & PU_ARROW)
1535 if (tmp->type == ARROW) 1311 if (tmp->type == ARROW)
1536 { 1312 {
1537 pick_up (op, tmp); 1313 pick_up (op, tmp);
1538 if (0)
1539 fprintf (stderr, "ARROW\n");
1540 continue; 1314 continue;
1541 } 1315 }
1542 1316
1543 /* all kinds of armor etc. */ 1317 /* all kinds of armor etc. */
1544 if (op->contr->mode & PU_ARMOUR) 1318 if (op->contr->mode & PU_ARMOUR)
1545 if (tmp->type == ARMOUR) 1319 if (tmp->type == ARMOUR)
1546 { 1320 {
1547 pick_up (op, tmp); 1321 pick_up (op, tmp);
1548 if (0)
1549 fprintf (stderr, "ARMOUR\n");
1550 continue; 1322 continue;
1551 } 1323 }
1324
1552 if (op->contr->mode & PU_HELMET) 1325 if (op->contr->mode & PU_HELMET)
1553 if (tmp->type == HELMET) 1326 if (tmp->type == HELMET)
1554 { 1327 {
1555 pick_up (op, tmp); 1328 pick_up (op, tmp);
1556 if (0)
1557 fprintf (stderr, "HELMET\n");
1558 continue; 1329 continue;
1559 } 1330 }
1331
1560 if (op->contr->mode & PU_SHIELD) 1332 if (op->contr->mode & PU_SHIELD)
1561 if (tmp->type == SHIELD) 1333 if (tmp->type == SHIELD)
1562 { 1334 {
1563 pick_up (op, tmp); 1335 pick_up (op, tmp);
1564 if (0)
1565 fprintf (stderr, "SHIELD\n");
1566 continue; 1336 continue;
1567 } 1337 }
1338
1568 if (op->contr->mode & PU_BOOTS) 1339 if (op->contr->mode & PU_BOOTS)
1569 if (tmp->type == BOOTS) 1340 if (tmp->type == BOOTS)
1570 { 1341 {
1571 pick_up (op, tmp); 1342 pick_up (op, tmp);
1572 if (0)
1573 fprintf (stderr, "BOOTS\n");
1574 continue; 1343 continue;
1575 } 1344 }
1345
1576 if (op->contr->mode & PU_GLOVES) 1346 if (op->contr->mode & PU_GLOVES)
1577 if (tmp->type == GLOVES) 1347 if (tmp->type == GLOVES)
1578 { 1348 {
1579 pick_up (op, tmp); 1349 pick_up (op, tmp);
1580 if (0)
1581 fprintf (stderr, "GLOVES\n");
1582 continue; 1350 continue;
1583 } 1351 }
1352
1584 if (op->contr->mode & PU_CLOAK) 1353 if (op->contr->mode & PU_CLOAK)
1585 if (tmp->type == CLOAK) 1354 if (tmp->type == CLOAK)
1586 { 1355 {
1587 pick_up (op, tmp); 1356 pick_up (op, tmp);
1588 if (0)
1589 fprintf (stderr, "GLOVES\n");
1590 continue; 1357 continue;
1591 } 1358 }
1592 1359
1593 /* hoping to catch throwing daggers here */ 1360 /* hoping to catch throwing daggers here */
1594 if (op->contr->mode & PU_MISSILEWEAPON) 1361 if (op->contr->mode & PU_MISSILEWEAPON)
1595 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN)) 1362 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1596 { 1363 {
1597 pick_up (op, tmp); 1364 pick_up (op, tmp);
1598 if (0)
1599 fprintf (stderr, "MISSILEWEAPON\n");
1600 continue; 1365 continue;
1601 } 1366 }
1602 1367
1603 /* careful: chairs and tables are weapons! */ 1368 /* careful: chairs and tables are weapons! */
1604 if (op->contr->mode & PU_ALLWEAPON) 1369 if (op->contr->mode & PU_ALLWEAPON)
… …
1607 { 1372 {
1608 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL && 1373 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&
1609 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL) 1374 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)
1610 { 1375 {
1611 pick_up (op, tmp); 1376 pick_up (op, tmp);
1612 if (0)
1613 fprintf (stderr, "WEAPON\n");
1614 continue; 1377 continue;
1615 } 1378 }
1616 } 1379 }
1380
1617 if (tmp->type == WEAPON && tmp->name == NULL) 1381 if (tmp->type == WEAPON && tmp->name == NULL)
1618 { 1382 {
1619 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL) 1383 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)
1620 { 1384 {
1621 pick_up (op, tmp); 1385 pick_up (op, tmp);
1622 if (0)
1623 fprintf (stderr, "WEAPON\n");
1624 continue; 1386 continue;
1625 } 1387 }
1626 } 1388 }
1627 } 1389 }
1628 1390
1629 /* misc stuff that's useful */ 1391 /* misc stuff that's useful */
1630 if (op->contr->mode & PU_KEY) 1392 if (op->contr->mode & PU_KEY)
1631 if (tmp->type == KEY || tmp->type == SPECIAL_KEY) 1393 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1632 { 1394 {
1633 pick_up (op, tmp); 1395 pick_up (op, tmp);
1634 if (0)
1635 fprintf (stderr, "KEY\n");
1636 continue; 1396 continue;
1637 } 1397 }
1638 1398
1639 /* any of the last 4 bits set means we use the ratio for value 1399 /* any of the last 4 bits set means we use the ratio for value
1640 * pickups */ 1400 * pickups */
… …
1662 continue; 1422 continue;
1663 } 1423 }
1664 } 1424 }
1665 } /* the new pickup model */ 1425 } /* the new pickup model */
1666 } 1426 }
1427
1667 return !stop; 1428 return !stop;
1668} 1429}
1669 1430
1670/* 1431/*
1671 * Find an arrow in the inventory and after that 1432 * Find an arrow in the inventory and after that
… …
1770 1531
1771object * 1532object *
1772pick_arrow_target (object *op, const char *type, int dir) 1533pick_arrow_target (object *op, const char *type, int dir)
1773{ 1534{
1774 object *tmp = NULL; 1535 object *tmp = NULL;
1775 mapstruct *m; 1536 maptile *m;
1776 int i, mflags, found, number; 1537 int i, mflags, found, number;
1777 sint16 x, y; 1538 sint16 x, y;
1778 1539
1779 if (op->map == NULL) 1540 if (op->map == NULL)
1780 return find_arrow (op, type); 1541 return find_arrow (op, type);
… …
1840 */ 1601 */
1841int 1602int
1842fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy) 1603fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1843{ 1604{
1844 object *left, *bow; 1605 object *left, *bow;
1845 tag_t left_tag, tag;
1846 int bowspeed, mflags; 1606 int bowspeed, mflags;
1847 mapstruct *m; 1607 maptile *m;
1848 1608
1849 if (!dir) 1609 if (!dir)
1850 { 1610 {
1851 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1611 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1852 return 0; 1612 return 0;
1853 } 1613 }
1614
1854 if (op->type == PLAYER) 1615 if (op->type == PLAYER)
1855 bow = op->contr->ranges[range_bow]; 1616 bow = op->contr->ranges[range_bow];
1856 else 1617 else
1857 { 1618 {
1858 for (bow = op->inv; bow; bow = bow->below) 1619 for (bow = op->inv; bow; bow = bow->below)
… …
1866 { 1627 {
1867 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1628 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1868 return 0; 1629 return 0;
1869 } 1630 }
1870 } 1631 }
1632
1871 if (!bow->race || !bow->skill) 1633 if (!bow->race || !bow->skill)
1872 { 1634 {
1873 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1635 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1874 return 0; 1636 return 0;
1875 } 1637 }
… …
1877 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex]; 1639 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1878 1640
1879 /* penalize ROF for bestarrow */ 1641 /* penalize ROF for bestarrow */
1880 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow) 1642 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1881 bowspeed -= dex_bonus[op->stats.Dex] + 5; 1643 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1644
1882 if (bowspeed < 1) 1645 if (bowspeed < 1)
1883 bowspeed = 1; 1646 bowspeed = 1;
1884 1647
1885 if (arrow == NULL) 1648 if (arrow == NULL)
1886 { 1649 {
… …
1892 else 1655 else
1893 CLEAR_FLAG (op, FLAG_READY_BOW); 1656 CLEAR_FLAG (op, FLAG_READY_BOW);
1894 return 0; 1657 return 0;
1895 } 1658 }
1896 } 1659 }
1660
1897 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1661 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
1898 if (mflags & P_OUT_OF_MAP) 1662 if (mflags & P_OUT_OF_MAP)
1899 {
1900 return 0; 1663 return 0;
1901 } 1664
1902 if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW) 1665 if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW)
1903 { 1666 {
1904 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1667 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
1905 return 0; 1668 return 0;
1906 } 1669 }
1907 1670
1908 /* this should not happen, but sometimes does */ 1671 /* this should not happen, but sometimes does */
1909 if (arrow->nrof == 0) 1672 if (arrow->nrof == 0)
1910 { 1673 {
1911 remove_ob (arrow); 1674 arrow->destroy ();
1912 free_object (arrow);
1913 return 0; 1675 return 0;
1914 } 1676 }
1915 1677
1916 left = arrow; /* these are arrows left to the player */ 1678 left = arrow; /* these are arrows left to the player */
1917 left_tag = left->count;
1918 arrow = get_split_ob (arrow, 1); 1679 arrow = get_split_ob (arrow, 1);
1919 if (arrow == NULL) 1680 if (!arrow)
1920 { 1681 {
1921 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1682 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1922 return 0; 1683 return 0;
1923 } 1684 }
1924 set_owner (arrow, op); 1685
1686 arrow->set_owner (op);
1925 arrow->skill = bow->skill; 1687 arrow->skill = bow->skill;
1926
1927 arrow->direction = dir; 1688 arrow->direction = dir;
1928 arrow->x = sx;
1929 arrow->y = sy;
1930 1689
1931 if (op->type == PLAYER) 1690 if (op->type == PLAYER)
1932 { 1691 {
1933 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed; 1692 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1934 fix_player (op); 1693 op->update_stats ();
1935 } 1694 }
1936 1695
1937 SET_ANIMATION (arrow, arrow->direction); 1696 SET_ANIMATION (arrow, arrow->direction);
1938 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */ 1697 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1939 arrow->stats.hp = arrow->stats.dam; 1698 arrow->stats.hp = arrow->stats.dam;
1940 arrow->stats.grace = arrow->attacktype; 1699 arrow->stats.grace = arrow->attacktype;
1941 if (arrow->slaying != NULL) 1700 if (arrow->slaying != NULL)
1942 arrow->spellarg = strdup_local (arrow->slaying); 1701 arrow->spellarg = strdup (arrow->slaying);
1943 1702
1944 /* Note that this was different for monsters - they got their level 1703 /* Note that this was different for monsters - they got their level
1945 * added to the damage. I think the strength bonus is more proper. 1704 * added to the damage. I think the strength bonus is more proper.
1946 */ 1705 */
1947 1706
… …
1949 1708
1950 /* update the speed */ 1709 /* update the speed */
1951 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 1710 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1952 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0; 1711 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1953 1712
1954 if (arrow->speed < 1.0) 1713 arrow->set_speed (max (arrow->speed, 1.0));
1955 arrow->speed = 1.0;
1956 update_ob_speed (arrow);
1957 arrow->speed_left = 0; 1714 arrow->speed_left = 0;
1958 1715
1959 if (op->type == PLAYER) 1716 if (op->type == PLAYER)
1960 { 1717 {
1961 arrow->stats.wc = 20 - bow->magic - arrow->magic - 1718 arrow->stats.wc = 20 - bow->magic - arrow->magic -
… …
1965 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1722 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1966 } 1723 }
1967 else 1724 else
1968 { 1725 {
1969 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod; 1726 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1970
1971 arrow->level = op->level; 1727 arrow->level = op->level;
1972 } 1728 }
1729
1973 if (arrow->attacktype == AT_PHYSICAL) 1730 if (arrow->attacktype == AT_PHYSICAL)
1974 arrow->attacktype |= bow->attacktype; 1731 arrow->attacktype |= bow->attacktype;
1732
1975 if (bow->slaying != NULL) 1733 if (bow->slaying)
1976 arrow->slaying = bow->slaying; 1734 arrow->slaying = bow->slaying;
1977 1735
1978 arrow->map = m;
1979 arrow->move_type = MOVE_FLY_LOW; 1736 arrow->move_type = MOVE_FLY_LOW;
1980 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1737 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1981 1738
1982 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1739 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1983 tag = arrow->count; 1740 m->insert (arrow, sx, sy, op);
1984 insert_ob_in_map (arrow, m, op, 0);
1985 1741
1986 if (!was_destroyed (arrow, tag)) 1742 if (!arrow->destroyed ())
1987 move_arrow (arrow); 1743 move_arrow (arrow);
1988 1744
1989 if (op->type == PLAYER) 1745 if (op->type == PLAYER)
1990 { 1746 {
1991 if (was_destroyed (left, left_tag)) 1747 if (left->destroyed ())
1992 esrv_del_item (op->contr, left_tag); 1748 esrv_del_item (op->contr, left->count);
1993 else 1749 else
1994 esrv_send_item (op, left); 1750 esrv_send_item (op, left);
1995 } 1751 }
1752
1996 return 1; 1753 return 1;
1997} 1754}
1998 1755
1999/* Special fire code for players - this takes into 1756/* Special fire code for players - this takes into
2000 * account the special fire modes players can have 1757 * account the special fire modes players can have
… …
2014 } 1771 }
2015 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1772 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
2016 { 1773 {
2017 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1774 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
2018 wcmod = -1; 1775 wcmod = -1;
1776
2019 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); 1777 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
2020 } 1778 }
2021 else if (op->contr->bowtype == bow_threewide) 1779 else if (op->contr->bowtype == bow_threewide)
2022 { 1780 {
2023 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1781 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
… …
2093 1851
2094 if (item->arch) 1852 if (item->arch)
2095 { 1853 {
2096 CLEAR_FLAG (item, FLAG_ANIMATE); 1854 CLEAR_FLAG (item, FLAG_ANIMATE);
2097 item->face = item->arch->clone.face; 1855 item->face = item->arch->clone.face;
2098 item->speed = 0; 1856 item->set_speed (0);
2099 update_ob_speed (item);
2100 } 1857 }
1858
2101 if ((tmp = is_player_inv (item))) 1859 if ((tmp = item->in_player ()))
2102 esrv_update_item (UPD_ANIM, tmp, item); 1860 esrv_update_item (UPD_ANIM, tmp, item);
2103 } 1861 }
2104 } 1862 }
2105 else if (item->type == ROD || item->type == HORN) 1863 else if (item->type == ROD || item->type == HORN)
2106 {
2107 drain_rod_charge (item); 1864 drain_rod_charge (item);
2108 }
2109 } 1865 }
2110} 1866}
2111 1867
2112/* Received a fire command for the player - go and do it. 1868/* Received a fire command for the player - go and do it.
2113 */ 1869 */
… …
2136 case range_misc: 1892 case range_misc:
2137 fire_misc_object (op, dir); 1893 fire_misc_object (op, dir);
2138 return; 1894 return;
2139 1895
2140 case range_golem: /* Control summoned monsters from scrolls */ 1896 case range_golem: /* Control summoned monsters from scrolls */
2141 if (op->contr->ranges[range_golem] == NULL || op->contr->golem_count != op->contr->ranges[range_golem]->count) 1897 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2142 { 1898 {
2143 op->contr->ranges[range_golem] = NULL; 1899 op->contr->ranges[range_golem] = 0;
2144 op->contr->shoottype = range_none; 1900 op->contr->shoottype = range_none;
2145 op->contr->golem_count = 0;
2146 } 1901 }
2147 else 1902 else
2148 control_golem (op->contr->ranges[range_golem], dir); 1903 control_golem (op->contr->ranges[range_golem], dir);
2149 return; 1904 return;
2150 1905
… …
2257 * 0 otherwise 2012 * 0 otherwise
2258 */ 2013 */
2259static int 2014static int
2260player_attack_door (object *op, object *door) 2015player_attack_door (object *op, object *door)
2261{ 2016{
2262
2263 /* If its a door, try to find a use a key. If we do destroy the door, 2017 /* If its a door, try to find a use a key. If we do destroy the door,
2264 * might as well return immediately as there is nothing more to do - 2018 * might as well return immediately as there is nothing more to do -
2265 * otherwise, we fall through to the rest of the code. 2019 * otherwise, we fall through to the rest of the code.
2266 */ 2020 */
2267 object *key = find_key (op, op, door); 2021 object *key = find_key (op, op, door);
… …
2305 * It should keep the code cleaner. 2059 * It should keep the code cleaner.
2306 * When this is called, the players direction has been updated 2060 * When this is called, the players direction has been updated
2307 * (taking into account confusion.) The player is also actually 2061 * (taking into account confusion.) The player is also actually
2308 * going to try and move (not fire weapons). 2062 * going to try and move (not fire weapons).
2309 */ 2063 */
2310
2311void 2064void
2312move_player_attack (object *op, int dir) 2065move_player_attack (object *op, int dir)
2313{ 2066{
2314 object *tmp, *mon; 2067 object *tmp, *mon;
2315 sint16 nx, ny; 2068 sint16 nx, ny;
2316 int on_battleground; 2069 int on_battleground;
2317 mapstruct *m; 2070 maptile *m;
2318 2071
2319 nx = freearr_x[dir] + op->x; 2072 nx = freearr_x[dir] + op->x;
2320 ny = freearr_y[dir] + op->y; 2073 ny = freearr_y[dir] + op->y;
2321 2074
2322 on_battleground = op_on_battleground (op, NULL, NULL); 2075 on_battleground = op_on_battleground (op, 0, 0);
2323 2076
2324 /* If braced, or can't move to the square, and it is not out of the 2077 /* If braced, or can't move to the square, and it is not out of the
2325 * map, attack it. Note order of if statement is important - don't 2078 * map, attack it. Note order of if statement is important - don't
2326 * want to be calling move_ob if braced, because move_ob will move the 2079 * want to be calling move_ob if braced, because move_ob will move the
2327 * player. This is a pretty nasty hack, because if we could 2080 * player. This is a pretty nasty hack, because if we could
… …
2332 */ 2085 */
2333 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny)) 2086 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2334 { 2087 {
2335 if (OUT_OF_REAL_MAP (op->map, nx, ny)) 2088 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2336 { 2089 {
2337 m = get_map_from_coord (op->map, &nx, &ny); 2090 m = op->map->xy_find (nx, ny);
2338 if (!m) 2091 if (!m)
2339 return; /* Don't think this should happen */ 2092 return; /* Don't think this should happen */
2340 } 2093 }
2341 else 2094 else
2342 m = op->map; 2095 m = op->map;
2343 2096
2344 if ((tmp = get_map_ob (m, nx, ny)) == NULL) 2097 if (!(tmp = m->at (nx, ny).bot))
2345 {
2346 /* LOG(llevError,"player_move_attack: get_map_ob returns NULL, but player can not more there.\n"); */
2347 return; 2098 return;
2348 }
2349 2099
2350 mon = NULL; 2100 mon = 0;
2351 /* Go through all the objects, and find ones of interest. Only stop if 2101 /* Go through all the objects, and find ones of interest. Only stop if
2352 * we find a monster - that is something we know we want to attack. 2102 * we find a monster - that is something we know we want to attack.
2353 * if its a door or barrel (can roll) see if there may be monsters 2103 * if its a door or barrel (can roll) see if there may be monsters
2354 * on the space 2104 * on the space
2355 */ 2105 */
2356 while (tmp != NULL) 2106 while (tmp)
2357 { 2107 {
2358 if (tmp == op) 2108 if (tmp == op)
2359 { 2109 {
2360 tmp = tmp->above; 2110 tmp = tmp->above;
2361 continue; 2111 continue;
2362 } 2112 }
2113
2363 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 2114 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2364 { 2115 {
2365 mon = tmp; 2116 mon = tmp;
2366 break; 2117 break;
2367 } 2118 }
2119
2368 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL)) 2120 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2369 mon = tmp; 2121 mon = tmp;
2122
2370 tmp = tmp->above; 2123 tmp = tmp->above;
2371 } 2124 }
2372 2125
2373 if (mon == NULL) /* This happens anytime the player tries to move */ 2126 if (!mon) /* This happens anytime the player tries to move */
2374 return; /* into a wall */ 2127 return; /* into a wall */
2375 2128
2376 if (mon->head != NULL) 2129 if (mon->head)
2377 mon = mon->head; 2130 mon = mon->head;
2378 2131
2379 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 2132 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2380 if (player_attack_door (op, mon)) 2133 if (player_attack_door (op, mon))
2381 return; 2134 return;
… …
2393 * player owns it and it is either friendly or unagressive. 2146 * player owns it and it is either friendly or unagressive.
2394 */ 2147 */
2395 if ((op->type == PLAYER) 2148 if ((op->type == PLAYER)
2396#if COZY_SERVER 2149#if COZY_SERVER
2397 && 2150 &&
2398 ((get_owner (mon) && get_owner (mon)->contr 2151 ((mon->owner && mon->owner->contr
2399 && same_party (get_owner (mon)->contr->party, op->contr->party)) || get_owner (mon) == op) 2152 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)
2400#else 2153#else
2401 && get_owner (mon) == op 2154 && mon->owner == op
2402#endif 2155#endif
2403 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2156 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2404 { 2157 {
2405 /* If we're braced, we don't want to switch places with it */ 2158 /* If we're braced, we don't want to switch places with it */
2406 if (op->contr->braced) 2159 if (op->contr->braced)
2407 return; 2160 return;
2161
2408 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2162 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2409 (void) push_ob (mon, dir, op); 2163 (void) push_ob (mon, dir, op);
2410 if (op->contr->tmp_invis || op->hide) 2164 if (op->contr->tmp_invis || op->hide)
2411 make_visible (op); 2165 make_visible (op);
2166
2412 return; 2167 return;
2413 } 2168 }
2414 2169
2415 /* in certain circumstances, you shouldn't attack friendly 2170 /* in certain circumstances, you shouldn't attack friendly
2416 * creatures. Note that if you are braced, you can't push 2171 * creatures. Note that if you are braced, you can't push
… …
2418 * attack them either. 2173 * attack them either.
2419 */ 2174 */
2420 if ((mon->type == PLAYER || mon->enemy != op) && 2175 if ((mon->type == PLAYER || mon->enemy != op) &&
2421 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2176 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (
2422#ifdef PROHIBIT_PLAYERKILL 2177#ifdef PROHIBIT_PLAYERKILL
2423 (op->contr->peaceful 2178 (op->contr->peaceful
2424 || (mon->type == PLAYER 2179 || (mon->type == PLAYER
2425 && mon->contr-> 2180 && mon->contr->
2426 peaceful)) && 2181 peaceful)) &&
2427#else 2182#else
2428 op->contr->peaceful && 2183 op->contr->peaceful &&
2429#endif 2184#endif
2430 !on_battleground)) 2185 !on_battleground))
2431 { 2186 {
2432 if (!op->contr->braced) 2187 if (!op->contr->braced)
2433 { 2188 {
2434 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2189 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2435 (void) push_ob (mon, dir, op); 2190 push_ob (mon, dir, op);
2436 } 2191 }
2437 else 2192 else
2438 {
2439 new_draw_info (0, 0, op, "You withhold your attack"); 2193 new_draw_info (0, 0, op, "You withhold your attack");
2440 } 2194
2441 if (op->contr->tmp_invis || op->hide) 2195 if (op->contr->tmp_invis || op->hide)
2442 make_visible (op); 2196 make_visible (op);
2443 } 2197 }
2444 2198
2445 /* If the object is a boulder or other rollable object, then 2199 /* If the object is a boulder or other rollable object, then
… …
2456 * Way it works is like this: First, it must have some hit points 2210 * Way it works is like this: First, it must have some hit points
2457 * and be living. Then, it must be one of the following: 2211 * and be living. Then, it must be one of the following:
2458 * 1) Not a player, 2) A player, but of a different party. Note 2212 * 1) Not a player, 2) A player, but of a different party. Note
2459 * that party_number -1 is no party, so attacks can still happen. 2213 * that party_number -1 is no party, so attacks can still happen.
2460 */ 2214 */
2461
2462 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2215 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2463 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2216 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2464 { 2217 {
2465 2218
2466 /* If the player hasn't hit something this tick, and does 2219 /* If the player hasn't hit something this tick, and does
… …
2473 op->speed_left += op->speed / op->contr->weapon_sp; 2226 op->speed_left += op->speed / op->contr->weapon_sp;
2474 2227
2475 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */ 2228 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2476 } 2229 }
2477 2230
2478 skill_attack (mon, op, 0, NULL, NULL); 2231 skill_attack (mon, op, 0, 0, 0);
2479 2232
2480 /* If attacking another player, that player gets automatic 2233 /* If attacking another player, that player gets automatic
2481 * hitback, and doesn't loose luck either. 2234 * hitback, and doesn't loose luck either.
2482 * Disable hitback on the battleground or if the target is 2235 * Disable hitback on the battleground or if the target is
2483 * the wiz. 2236 * the wiz.
… …
2485 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ)) 2238 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2486 { 2239 {
2487 short luck = mon->stats.luck; 2240 short luck = mon->stats.luck;
2488 2241
2489 mon->contr->has_hit = 1; 2242 mon->contr->has_hit = 1;
2490 skill_attack (op, mon, 0, NULL, NULL); 2243 skill_attack (op, mon, 0, 0, 0);
2491 mon->stats.luck = luck; 2244 mon->stats.luck = luck;
2492 } 2245 }
2246
2493 if (action_makes_visible (op)) 2247 if (action_makes_visible (op))
2494 make_visible (op); 2248 make_visible (op);
2495 } 2249 }
2496 } /* if player should attack something */ 2250 } /* if player should attack something */
2497} 2251}
… …
2499int 2253int
2500move_player (object *op, int dir) 2254move_player (object *op, int dir)
2501{ 2255{
2502 int pick; 2256 int pick;
2503 2257
2504 if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY) 2258 if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2505 return 0; 2259 return 0;
2506 2260
2507 /* Sanity check: make sure dir is valid */ 2261 /* Sanity check: make sure dir is valid */
2508 if ((dir < 0) || (dir >= 9)) 2262 if ((dir < 0) || (dir >= 9))
2509 { 2263 {
2510 LOG (llevError, "move_player: invalid direction %d\n", dir); 2264 LOG (llevError, "move_player: invalid direction %d\n", dir);
2511 return 0; 2265 return 0;
2512 } 2266 }
2513 2267
2514 /* peterm: added following line */ 2268 /* peterm: added following line */
2515 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2269 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2516 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2270 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);
2517 2271
2518 op->facing = dir; 2272 op->facing = dir;
2519 2273
… …
2532 2286
2533 /* Add special check for newcs players and fire on - this way, the 2287 /* Add special check for newcs players and fire on - this way, the
2534 * server can handle repeat firing. 2288 * server can handle repeat firing.
2535 */ 2289 */
2536 if (op->contr->fire_on || (op->contr->run_on && pick != 0)) 2290 if (op->contr->fire_on || (op->contr->run_on && pick != 0))
2537 {
2538 op->direction = dir; 2291 op->direction = dir;
2539 }
2540 else 2292 else
2541 {
2542 op->direction = 0; 2293 op->direction = 0;
2543 } 2294
2544 /* Update how the player looks. Use the facing, so direction may 2295 /* Update how the player looks. Use the facing, so direction may
2545 * get reset to zero. This allows for full animation capabilities 2296 * get reset to zero. This allows for full animation capabilities
2546 * for players. 2297 * for players.
2547 */ 2298 */
2548 animate_object (op, op->facing); 2299 animate_object (op, op->facing);
… …
2593 /* I've been seeing crashes where the golem has been destroyed, but 2344 /* I've been seeing crashes where the golem has been destroyed, but
2594 * the player object still points to the defunct golem. The code that 2345 * the player object still points to the defunct golem. The code that
2595 * destroys the golem looks correct, and it doesn't always happen, so 2346 * destroys the golem looks correct, and it doesn't always happen, so
2596 * put this in a a workaround to clean up the golem pointer. 2347 * put this in a a workaround to clean up the golem pointer.
2597 */ 2348 */
2598 if (op->contr->ranges[range_golem] &&
2599 ((op->contr->golem_count != op->contr->ranges[range_golem]->count) || QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))) 2349 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2600 {
2601 op->contr->ranges[range_golem] = NULL; 2350 op->contr->ranges[range_golem] = 0;
2602 op->contr->golem_count = 0;
2603 }
2604 2351
2605 /* call this here - we also will call this in do_ericserver, but 2352 /* call this here - we also will call this in do_ericserver, but
2606 * the players time has been increased when doericserver has been 2353 * the players time has been increased when doericserver has been
2607 * called, so we recheck it here. 2354 * called, so we recheck it here.
2608 */ 2355 */
2609 HandleClient (&op->contr->socket, op->contr); 2356 if (op->contr->ns->handle_command ())
2357 return 1;
2358
2610 if (op->speed_left < 0) 2359 if (op->speed_left > 0)
2611 return 0; 2360 {
2612
2613 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2361 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2614 { 2362 {
2615 /* All move commands take 1 tick, at least for now */ 2363 /* All move commands take 1 tick, at least for now */
2616 op->speed_left--; 2364 op->speed_left--;
2617 2365
2618 /* Instead of all the stuff below, let move_player take care 2366 /* Instead of all the stuff below, let move_player take care
2619 * of it. Also, some of the skill stuff is only put in 2367 * of it. Also, some of the skill stuff is only put in
2620 * there, as well as the confusion stuff. 2368 * there, as well as the confusion stuff.
2621 */ 2369 */
2622 move_player (op, op->direction); 2370 move_player (op, op->direction);
2623 if (op->speed_left > 0) 2371
2624 return 1; 2372 return op->speed_left > 0;
2625 else 2373 }
2626 return 0;
2627 } 2374 }
2375
2628 return 0; 2376 return 0;
2629} 2377}
2630 2378
2631int 2379int
2632save_life (object *op) 2380save_life (object *op)
2633{ 2381{
2634 object *tmp;
2635
2636 if (!QUERY_FLAG (op, FLAG_LIFESAVE)) 2382 if (!QUERY_FLAG (op, FLAG_LIFESAVE))
2637 return 0; 2383 return 0;
2638 2384
2639 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2385 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2640 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2386 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2641 { 2387 {
2642 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2388 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);
2643 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2389 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2390
2644 if (op->contr) 2391 if (op->contr)
2645 esrv_del_item (op->contr, tmp->count); 2392 esrv_del_item (op->contr, tmp->count);
2646 remove_ob (tmp); 2393
2647 free_object (tmp); 2394 tmp->destroy ();
2648 CLEAR_FLAG (op, FLAG_LIFESAVE); 2395 CLEAR_FLAG (op, FLAG_LIFESAVE);
2396
2649 if (op->stats.hp < 0) 2397 if (op->stats.hp < 0)
2650 op->stats.hp = op->stats.maxhp; 2398 op->stats.hp = op->stats.maxhp;
2399
2651 if (op->stats.food < 0) 2400 if (op->stats.food < 0)
2652 op->stats.food = 999; 2401 op->stats.food = 999;
2653 fix_player (op); 2402
2403 op->update_stats ();
2654 return 1; 2404 return 1;
2655 } 2405 }
2406
2656 LOG (llevError, "Error: LIFESAVE set without applied object.\n"); 2407 LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2657 CLEAR_FLAG (op, FLAG_LIFESAVE); 2408 CLEAR_FLAG (op, FLAG_LIFESAVE);
2658 enter_player_savebed (op); /* bring him home. */ 2409 enter_player_savebed (op); /* bring him home. */
2659 return 0; 2410 return 0;
2660} 2411}
… …
2669{ 2420{
2670 object *next; 2421 object *next;
2671 2422
2672 while (op) 2423 while (op)
2673 { 2424 {
2674 next = op->below; /* Make sure we have a good value, in case 2425 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2675 * we remove object 'op' 2426
2676 */
2677 if (QUERY_FLAG (op, FLAG_UNPAID)) 2427 if (QUERY_FLAG (op, FLAG_UNPAID))
2678 { 2428 {
2679 remove_ob (op);
2680 op->x = env->x;
2681 op->y = env->y;
2682 if (env->type == PLAYER) 2429 if (env->type == PLAYER)
2683 esrv_del_item (env->contr, op->count); 2430 esrv_del_item (env->contr, op->count);
2684 insert_ob_in_map (op, env->map, NULL, 0); 2431
2432 op->insert_at (env);
2685 } 2433 }
2686 else if (op->inv) 2434 else if (op->inv)
2687 remove_unpaid_objects (op->inv, env); 2435 remove_unpaid_objects (op->inv, env);
2436
2688 op = next; 2437 op = next;
2689 } 2438 }
2690} 2439}
2691
2692 2440
2693/* 2441/*
2694 * Returns pointer a static string containing gravestone text 2442 * Returns pointer a static string containing gravestone text
2695 * Moved from apply.c to player.c - player.c is what 2443 * Moved from apply.c to player.c - player.c is what
2696 * actually uses this function. player.c may not be quite the 2444 * actually uses this function. player.c may not be quite the
… …
2707 strcpy (buf2, " R.I.P.\n\n"); 2455 strcpy (buf2, " R.I.P.\n\n");
2708 if (op->type == PLAYER) 2456 if (op->type == PLAYER)
2709 sprintf (buf, "%s the %s\n", &op->name, op->contr->title); 2457 sprintf (buf, "%s the %s\n", &op->name, op->contr->title);
2710 else 2458 else
2711 sprintf (buf, "%s\n", &op->name); 2459 sprintf (buf, "%s\n", &op->name);
2460
2712 strncat (buf2, " ", 20 - strlen (buf) / 2); 2461 strncat (buf2, " ", 20 - strlen (buf) / 2);
2713 strcat (buf2, buf); 2462 strcat (buf2, buf);
2714 if (op->type == PLAYER) 2463 if (op->type == PLAYER)
2715 sprintf (buf, "who was in level %d when killed\n", op->level); 2464 sprintf (buf, "who was in level %d when killed\n", op->level);
2716 else 2465 else
2717 sprintf (buf, "who was in level %d when died.\n\n", op->level); 2466 sprintf (buf, "who was in level %d when died.\n\n", op->level);
2467
2718 strncat (buf2, " ", 20 - strlen (buf) / 2); 2468 strncat (buf2, " ", 20 - strlen (buf) / 2);
2719 strcat (buf2, buf); 2469 strcat (buf2, buf);
2720 if (op->type == PLAYER) 2470 if (op->type == PLAYER)
2721 { 2471 {
2722 sprintf (buf, "by %s.\n\n", op->contr->killer); 2472 sprintf (buf, "by %s.\n\n", op->contr->killer);
2723 strncat (buf2, " ", 21 - strlen (buf) / 2); 2473 strncat (buf2, " ", 21 - strlen (buf) / 2);
2724 strcat (buf2, buf); 2474 strcat (buf2, buf);
2725 } 2475 }
2476
2726 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now)); 2477 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));
2727 strncat (buf2, " ", 20 - strlen (buf) / 2); 2478 strncat (buf2, " ", 20 - strlen (buf) / 2);
2728 strcat (buf2, buf); 2479 strcat (buf2, buf);
2480
2729 return buf2; 2481 return buf2;
2730} 2482}
2731
2732
2733 2483
2734void 2484void
2735do_some_living (object *op) 2485do_some_living (object *op)
2736{ 2486{
2737 int last_food = op->stats.food; 2487 int last_food = op->stats.food;
… …
2746 const int max_grace = 1; 2496 const int max_grace = 1;
2747 2497
2748 if (op->contr->outputs_sync) 2498 if (op->contr->outputs_sync)
2749 { 2499 {
2750 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2500 for (i = 0; i < NUM_OUTPUT_BUFS; i++)
2751 if (op->contr->outputs[i].buf != NULL && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2501 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)
2752 flush_output_element (op, &op->contr->outputs[i]); 2502 flush_output_element (op, &op->contr->outputs[i]);
2753 } 2503 }
2754 2504
2755 if (op->contr->state == ST_PLAYING) 2505 if (op->contr->ns->state == ST_PLAYING)
2756 { 2506 {
2757
2758 /* these next three if clauses make it possible to SLOW DOWN 2507 /* these next three if clauses make it possible to SLOW DOWN
2759 hp/grace/spellpoint regeneration. */ 2508 hp/grace/spellpoint regeneration. */
2760 if (op->contr->gen_hp >= 0) 2509 if (op->contr->gen_hp >= 0)
2761 gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp; 2510 gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp;
2762 else 2511 else
2763 { 2512 {
2764 gen_hp = op->stats.maxhp; 2513 gen_hp = op->stats.maxhp;
2765 rate_hp -= rate_hp / 2 * op->contr->gen_hp; 2514 rate_hp -= rate_hp / 2 * op->contr->gen_hp;
2766 } 2515 }
2516
2767 if (op->contr->gen_sp >= 0) 2517 if (op->contr->gen_sp >= 0)
2768 gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp; 2518 gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp;
2769 else 2519 else
2770 { 2520 {
2771 gen_sp = op->stats.maxsp; 2521 gen_sp = op->stats.maxsp;
2772 rate_sp -= rate_sp / 2 * op->contr->gen_sp; 2522 rate_sp -= rate_sp / 2 * op->contr->gen_sp;
2773 } 2523 }
2524
2774 if (op->contr->gen_grace >= 0) 2525 if (op->contr->gen_grace >= 0)
2775 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2526 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2776 else 2527 else
2777 { 2528 {
2778 gen_grace = op->stats.maxgrace; 2529 gen_grace = op->stats.maxgrace;
… …
2794 op->stats.food += op->contr->digestion; 2545 op->stats.food += op->contr->digestion;
2795 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2546 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2796 op->stats.food = last_food; 2547 op->stats.food = last_food;
2797 } 2548 }
2798 } 2549 }
2550
2799 if (max_sp > 1) 2551 if (max_sp > 1)
2800 { 2552 {
2801 over_sp = (gen_sp + 10) / rate_sp; 2553 over_sp = (gen_sp + 10) / rate_sp;
2802 if (over_sp > 0) 2554 if (over_sp > 0)
2803 { 2555 {
2804 if (op->stats.sp < op->stats.maxsp) 2556 if (op->stats.sp < op->stats.maxsp)
2805 { 2557 {
2806 op->stats.sp += over_sp > max_sp ? max_sp : over_sp; 2558 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2559
2807 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp)) 2560 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2808 op->stats.sp--; 2561 op->stats.sp--;
2562
2809 if (op->stats.sp > op->stats.maxsp) 2563 if (op->stats.sp > op->stats.maxsp)
2810 op->stats.sp = op->stats.maxsp; 2564 op->stats.sp = op->stats.maxsp;
2811 } 2565 }
2812 op->last_sp = 0; 2566 op->last_sp = 0;
2813 } 2567 }
2814 else 2568 else
2815 {
2816 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10); 2569 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2817 }
2818 } 2570 }
2819 else 2571 else
2820 {
2821 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10); 2572 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2822 }
2823 } 2573 }
2824 2574
2825 /* Regenerate Grace */ 2575 /* Regenerate Grace */
2826 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2576 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2827 if (--op->last_grace < 0) 2577 if (--op->last_grace < 0)
2828 { 2578 {
2829 if (op->stats.grace < op->stats.maxgrace / 2) 2579 if (op->stats.grace < op->stats.maxgrace / 2)
2830 op->stats.grace++; /* no penalty in food for regaining grace */ 2580 op->stats.grace++; /* no penalty in food for regaining grace */
2581
2831 if (max_grace > 1) 2582 if (max_grace > 1)
2832 { 2583 {
2833 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace; 2584 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;
2834 if (over_grace > 0) 2585 if (over_grace > 0)
2835 { 2586 {
… …
2863 op->stats.food += op->contr->digestion; 2614 op->stats.food += op->contr->digestion;
2864 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2615 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2865 op->stats.food = last_food; 2616 op->stats.food = last_food;
2866 } 2617 }
2867 } 2618 }
2619
2868 if (max_hp > 1) 2620 if (max_hp > 1)
2869 { 2621 {
2870 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp; 2622 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2871 if (over_hp > 0) 2623 if (over_hp > 0)
2872 { 2624 {
… …
2896 2648
2897 if (op->contr->gen_hp > 0) 2649 if (op->contr->gen_hp > 0)
2898 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2650 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2899 else 2651 else
2900 op->last_eat = 25 * (1 + bonus) / (penalty + 1); 2652 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2653
2901 /* dms do not consume food */ 2654 /* dms do not consume food */
2902 if (!QUERY_FLAG (op, FLAG_WIZ)) 2655 if (!QUERY_FLAG (op, FLAG_WIZ))
2903 op->stats.food--; 2656 op->stats.food--;
2904 } 2657 }
2905 }
2906 2658
2907 if (op->contr->state == ST_PLAYING && op->stats.food < 0 && op->stats.hp >= 0) 2659 if (op->stats.food < 0 && op->stats.hp >= 0)
2908 { 2660 {
2909 object *tmp, *flesh = NULL; 2661 object *tmp, *flesh = 0;
2910 2662
2911 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2663 for (tmp = op->inv; tmp; tmp = tmp->below)
2912 { 2664 {
2913 if (!QUERY_FLAG (tmp, FLAG_UNPAID)) 2665 if (!QUERY_FLAG (tmp, FLAG_UNPAID))
2914 {
2915 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2916 { 2666 {
2667 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2668 {
2917 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2669 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2918 manual_apply (op, tmp, 0); 2670 manual_apply (op, tmp, 0);
2919 if (op->stats.food >= 0 || op->stats.hp < 0) 2671 if (op->stats.food >= 0 || op->stats.hp < 0)
2920 break; 2672 break;
2921 } 2673 }
2922 else if (tmp->type == FLESH) 2674 else if (tmp->type == FLESH)
2923 flesh = tmp; 2675 flesh = tmp;
2924 } /* End if paid for object */ 2676 } /* End if paid for object */
2925 } /* end of for loop */ 2677 } /* end of for loop */
2678
2926 /* If player is still starving, it means they don't have any food, so 2679 /* If player is still starving, it means they don't have any food, so
2927 * eat flesh instead. 2680 * eat flesh instead.
2928 */ 2681 */
2929 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2682 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2930 { 2683 {
2931 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2684 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2932 manual_apply (op, flesh, 0); 2685 manual_apply (op, flesh, 0);
2933 } 2686 }
2934 } /* end if player is starving */ 2687 }
2935 2688
2936 while (op->stats.food < 0 && op->stats.hp > 0) 2689 while (op->stats.food < 0 && op->stats.hp >= 0)
2937 op->stats.food++, op->stats.hp--; 2690 op->stats.food++, op->stats.hp--;
2938 2691
2939 if (!op->contr->state && !QUERY_FLAG (op, FLAG_WIZ) && (op->stats.hp < 0 || op->stats.food < 0)) 2692 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2940 kill_player (op); 2693 kill_player (op);
2694 }
2941} 2695}
2942
2943
2944 2696
2945/* If the player should die (lack of hp, food, etc), we call this. 2697/* If the player should die (lack of hp, food, etc), we call this.
2946 * op is the player in jeopardy. If the player can not be saved (not 2698 * op is the player in jeopardy. If the player can not be saved (not
2947 * permadeath, no lifesave), this will take care of removing the player 2699 * permadeath, no lifesave), this will take care of removing the player
2948 * file. 2700 * file.
… …
2952{ 2704{
2953 char buf[MAX_BUF]; 2705 char buf[MAX_BUF];
2954 int x, y; 2706 int x, y;
2955 2707
2956 //int i; 2708 //int i;
2957 mapstruct *map; /* this is for resurrection */ 2709 maptile *map; /* this is for resurrection */
2958 2710
2959 /* int z; 2711 /* int z;
2960 int num_stats_lose; 2712 int num_stats_lose;
2961 int lost_a_stat; 2713 int lost_a_stat;
2962 int lose_this_stat; 2714 int lose_this_stat;
… …
2978 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); 2730 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");
2979 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life..."); 2731 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2980 2732
2981 /* restore player */ 2733 /* restore player */
2982 at = archetype::find ("poisoning"); 2734 at = archetype::find ("poisoning");
2983 tmp = present_arch_in_ob (at, op); 2735 if (object *tmp = present_arch_in_ob (at, op))
2984 if (tmp)
2985 { 2736 {
2986 remove_ob (tmp); 2737 tmp->destroy ();
2987 free_object (tmp);
2988 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2738 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2989 } 2739 }
2990 2740
2991 at = archetype::find ("confusion"); 2741 at = archetype::find ("confusion");
2992 tmp = present_arch_in_ob (at, op); 2742 if (object *tmp = present_arch_in_ob (at, op))
2993 if (tmp)
2994 { 2743 {
2995 remove_ob (tmp); 2744 tmp->destroy ();
2996 free_object (tmp);
2997 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2745 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2998 } 2746 }
2999 2747
3000 cure_disease (op, 0); /* remove any disease */ 2748 cure_disease (op, 0); /* remove any disease */
3001 op->stats.hp = op->stats.maxhp; 2749 op->stats.hp = op->stats.maxhp;
3002 if (op->stats.food <= 0) 2750 if (op->stats.food <= 0)
3003 op->stats.food = 999; 2751 op->stats.food = 999;
3004 2752
3005 /* create a bodypart-trophy to make the winner happy */ 2753 /* create a bodypart-trophy to make the winner happy */
3006 tmp = arch_to_object (archetype::find ("finger")); 2754 if (object *tmp = arch_to_object (archetype::find ("finger")))
3007 if (tmp != NULL)
3008 { 2755 {
3009 sprintf (buf, "%s's finger", &op->name); 2756 sprintf (buf, "%s's finger", &op->name);
3010 tmp->name = buf; 2757 tmp->name = buf;
3011 sprintf (buf, " This finger has been cut off %s\n" 2758 sprintf (buf, " This finger has been cut off %s\n"
3012 " the %s, when he was defeated at\n level %d by %s.\n", 2759 " the %s, when he was defeated at\n level %d by %s.\n",
3013 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2760 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
3014 tmp->msg = buf; 2761 tmp->msg = buf;
3015 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2762 tmp->value = 0, tmp->material = 0, tmp->type = 0;
3016 tmp->materialname = NULL; 2763 tmp->materialname = NULL;
3017 tmp->x = op->x, tmp->y = op->y; 2764 op->insert_at (tmp, op);
3018 insert_ob_in_map (tmp, op->map, op, 0);
3019 } 2765 }
3020 2766
3021 /* teleport defeated player to new destination */ 2767 /* teleport defeated player to new destination */
3022 transfer_ob (op, x, y, 0, NULL); 2768 transfer_ob (op, x, y, 0, NULL);
3023 op->contr->braced = 0; 2769 op->contr->braced = 0;
… …
3049 op->stats.hp = op->stats.maxhp; 2795 op->stats.hp = op->stats.maxhp;
3050 return; 2796 return;
3051 } 2797 }
3052 sprintf (buf, "%s died.", &op->name); 2798 sprintf (buf, "%s died.", &op->name);
3053 } 2799 }
2800
3054 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2801 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
3055 2802
3056 /* save the map location for corpse, gravestone */ 2803 /* save the map location for corpse, gravestone */
3057 x = op->x; 2804 x = op->x;
3058 y = op->y; 2805 y = op->y;
3059 map = op->map; 2806 map = op->map;
3060 2807
3061
3062 if (settings.not_permadeth == TRUE)
3063 {
3064 /* NOT_PERMADEATH code. This basically brings the character back to 2808 /* NOT_PERMADEATH code. This basically brings the character back to
3065 * life if they are dead - it takes some exp and a random stat. 2809 * life if they are dead - it takes some exp and a random stat.
3066 * See the config.h file for a little more in depth detail about this. 2810 * See the config.h file for a little more in depth detail about this.
3067 */ 2811 */
3068 2812
3069 /* Basically two ways to go - remove a stat permanently, or just 2813 /* Basically two ways to go - remove a stat permanently, or just
3070 * make it depletion. This bunch of code deals with that aspect 2814 * make it depletion. This bunch of code deals with that aspect
3071 * of death. 2815 * of death.
3072 */ 2816 */
3073#ifndef COZY_SERVER 2817#ifndef COZY_SERVER
3074 if (settings.balanced_stat_loss) 2818 if (settings.balanced_stat_loss)
3075 { 2819 {
3076 /* If stat loss is permanent, lose one stat only. */ 2820 /* If stat loss is permanent, lose one stat only. */
3077 /* Lower level chars don't lose as many stats because they suffer 2821 /* Lower level chars don't lose as many stats because they suffer
3078 more if they do. */ 2822 more if they do. */
3079 /* Higher level characters can afford things such as potions of 2823 /* Higher level characters can afford things such as potions of
3080 restoration, or better, stat potions. So we slug them that 2824 restoration, or better, stat potions. So we slug them that
3081 little bit harder. */ 2825 little bit harder. */
3082 /* GD */ 2826 /* GD */
3083 if (settings.stat_loss_on_death) 2827 if (settings.stat_loss_on_death)
3084 num_stats_lose = 1; 2828 num_stats_lose = 1;
3085 else
3086 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
3087 }
3088 else 2829 else
3089 { 2830 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
2831 }
2832 else
3090 num_stats_lose = 1; 2833 num_stats_lose = 1;
3091 } 2834
3092 lost_a_stat = 0; 2835 lost_a_stat = 0;
3093 2836
3094 for (z = 0; z < num_stats_lose; z++) 2837 for (z = 0; z < num_stats_lose; z++)
3095 { 2838 {
3096 i = RANDOM () % NUM_STATS; 2839 i = RANDOM () % NUM_STATS;
3097 2840
3098 if (settings.stat_loss_on_death) 2841 if (settings.stat_loss_on_death)
3099 { 2842 {
3100 /* Pick a random stat and take a point off it. Tell the player 2843 /* Pick a random stat and take a point off it. Tell the player
3101 * what he lost. 2844 * what he lost.
3102 */ 2845 */
3103 change_attr_value (&(op->stats), i, -1); 2846 change_attr_value (&(op->stats), i, -1);
3104 check_stat_bounds (&(op->stats)); 2847 check_stat_bounds (&(op->stats));
3105 change_attr_value (&(op->contr->orig_stats), i, -1); 2848 change_attr_value (&(op->contr->orig_stats), i, -1);
3106 check_stat_bounds (&(op->contr->orig_stats)); 2849 check_stat_bounds (&(op->contr->orig_stats));
3107 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]); 2850 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
3108 lost_a_stat = 1; 2851 lost_a_stat = 1;
2852 }
2853 else
2854 {
2855 /* deplete a stat */
2856 archetype *deparch = archetype::find ("depletion");
2857 object *dep;
2858
2859 dep = present_arch_in_ob (deparch, op);
2860 if (!dep)
2861 {
2862 dep = arch_to_object (deparch);
2863 insert_ob_in_ob (dep, op);
3109 } 2864 }
3110 else 2865 lose_this_stat = 1;
2866 if (settings.balanced_stat_loss)
3111 { 2867 {
3112 /* deplete a stat */ 2868 /* GD */
3113 archetype *deparch = archetype::find ("depletion"); 2869 /* Get the stat that we're about to deplete. */
3114 object *dep; 2870 this_stat = get_attr_value (&(dep->stats), i);
3115 2871 if (this_stat < 0)
3116 dep = present_arch_in_ob (deparch, op);
3117 if (!dep)
3118 { 2872 {
3119 dep = arch_to_object (deparch); 2873 int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3120 insert_ob_in_ob (dep, op); 2874 int keep_chance = this_stat * this_stat;
3121 } 2875
3122 lose_this_stat = 1; 2876 /* Yes, I am paranoid. Sue me. */
3123 if (settings.balanced_stat_loss)
3124 {
3125 /* GD */
3126 /* Get the stat that we're about to deplete. */
3127 this_stat = get_attr_value (&(dep->stats), i);
3128 if (this_stat < 0) 2877 if (keep_chance < 1)
2878 keep_chance = 1;
2879
2880 /* There is a maximum depletion total per level. */
2881 if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
3129 { 2882 {
3130 int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3131 int keep_chance = this_stat * this_stat;
3132
3133 /* Yes, I am paranoid. Sue me. */
3134 if (keep_chance < 1)
3135 keep_chance = 1;
3136
3137 /* There is a maximum depletion total per level. */
3138 if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
3139 {
3140 lose_this_stat = 0; 2883 lose_this_stat = 0;
3141 /* Take loss chance vs keep chance to see if we 2884 /* Take loss chance vs keep chance to see if we
3142 retain the stat. */ 2885 retain the stat. */
3143 }
3144 else
3145 {
3146 if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
3147 lose_this_stat = 0;
3148 /* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
3149 this_stat, keep_chance, loss_chance,
3150 lose_this_stat?"LOSE":"KEEP"); */
3151 }
3152 } 2886 }
3153 }
3154
3155 if (lose_this_stat)
3156 {
3157 this_stat = get_attr_value (&(dep->stats), i);
3158 /* We could try to do something clever like find another
3159 * stat to reduce if this fails. But chances are, if
3160 * stats have been depleted to -50, all are pretty low
3161 * and should be roughly the same, so it shouldn't make a
3162 * difference.
3163 */ 2887 else
3164 if (this_stat >= -50)
3165 { 2888 {
3166 change_attr_value (&(dep->stats), i, -1); 2889 if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
3167 SET_FLAG (dep, FLAG_APPLIED);
3168 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
3169 fix_player (op);
3170 lost_a_stat = 1; 2890 lose_this_stat = 0;
2891 /* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
2892 this_stat, keep_chance, loss_chance,
2893 lose_this_stat?"LOSE":"KEEP"); */
3171 } 2894 }
3172 } 2895 }
3173 } 2896 }
2897
2898 if (lose_this_stat)
2899 {
2900 this_stat = get_attr_value (&(dep->stats), i);
2901 /* We could try to do something clever like find another
2902 * stat to reduce if this fails. But chances are, if
2903 * stats have been depleted to -50, all are pretty low
2904 * and should be roughly the same, so it shouldn't make a
2905 * difference.
2906 */
2907 if (this_stat >= -50)
2908 {
2909 change_attr_value (&(dep->stats), i, -1);
2910 SET_FLAG (dep, FLAG_APPLIED);
2911 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2912 op->update_stats ();
2913 lost_a_stat = 1;
2914 }
3174 } 2915 }
2916 }
2917 }
3175 /* If no stat lost, tell the player. */ 2918 /* If no stat lost, tell the player. */
3176 if (!lost_a_stat) 2919 if (!lost_a_stat)
3177 { 2920 {
3178 /* determine_god() seems to not work sometimes... why is this? 2921 /* determine_god() seems to not work sometimes... why is this?
3179 Should I be using something else? GD */ 2922 Should I be using something else? GD */
3180 const char *god = determine_god (op); 2923 const char *god = determine_god (op);
3181 2924
3182 if (god && (strcmp (god, "none"))) 2925 if (god && (strcmp (god, "none")))
3183 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief " "moment you feel the holy presence of %s protecting" " you.", god); 2926 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
3184 else 2927 else
3185 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you."); 2928 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
3186 } 2929 }
2930#else
2931 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");
3187#endif 2932#endif
3188 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");
3189 2933
3190 /* Put a gravestone up where the character 'almost' died. List the 2934 /* Put a gravestone up where the character 'almost' died. List the
3191 * exp loss on the stone. 2935 * exp loss on the stone.
3192 */ 2936 */
3193 tmp = arch_to_object (archetype::find ("gravestone")); 2937 tmp = arch_to_object (archetype::find ("gravestone"));
3194 sprintf (buf, "%s's gravestone", &op->name); 2938 sprintf (buf, "%s's gravestone", &op->name);
3195 tmp->name = buf; 2939 tmp->name = buf;
3196 sprintf (buf, "%s's gravestones", &op->name); 2940 sprintf (buf, "%s's gravestones", &op->name);
3197 tmp->name_pl = buf; 2941 tmp->name_pl = buf;
3198 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); 2942 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);
3199 tmp->msg = buf; 2943 tmp->msg = buf;
3200 tmp->x = op->x, tmp->y = op->y; 2944 tmp->x = op->x, tmp->y = op->y;
3201 insert_ob_in_map (tmp, op->map, NULL, 0); 2945 insert_ob_in_map (tmp, op->map, NULL, 0);
3202 2946
3203 /**************************************/ 2947 /**************************************/
3204 /* */ 2948 /* */
3205 /* Subtract the experience points, */ 2949 /* Subtract the experience points, */
3206 /* if we died cause of food, give us */ 2950 /* if we died cause of food, give us */
3207 /* food, and reset HP's... */ 2951 /* food, and reset HP's... */
3208 /* */ 2952 /* */
3209
3210 /**************************************/ 2953 /**************************************/
3211 2954
3212 /* remove any poisoning and confusion the character may be suffering. */ 2955 /* remove any poisoning and confusion the character may be suffering. */
3213 /* restore player */ 2956 /* restore player */
3214 at = archetype::find ("poisoning"); 2957 at = archetype::find ("poisoning");
3215 tmp = present_arch_in_ob (at, op); 2958 tmp = present_arch_in_ob (at, op);
2959
3216 if (tmp) 2960 if (tmp)
3217 { 2961 {
3218 remove_ob (tmp); 2962 tmp->destroy ();
3219 free_object (tmp);
3220 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2963 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
3221 } 2964 }
3222 2965
3223 at = archetype::find ("confusion"); 2966 at = archetype::find ("confusion");
3224 tmp = present_arch_in_ob (at, op); 2967 tmp = present_arch_in_ob (at, op);
3225 if (tmp) 2968 if (tmp)
3226 { 2969 {
3227 remove_ob (tmp); 2970 tmp->destroy ();
3228 free_object (tmp);
3229 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2971 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
3230 } 2972 }
2973
3231 cure_disease (op, 0); /* remove any disease */ 2974 cure_disease (op, 0); /* remove any disease */
3232 2975
3233 /*add_exp(op, (op->stats.exp * -0.20)); */ 2976 /*add_exp(op, (op->stats.exp * -0.20)); */
3234 apply_death_exp_penalty (op); 2977 apply_death_exp_penalty (op);
3235 if (op->stats.food < 100) 2978 if (op->stats.food < 100)
3236 op->stats.food = 900; 2979 op->stats.food = 900;
3237 op->stats.hp = op->stats.maxhp; 2980 op->stats.hp = op->stats.maxhp;
3238 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2981 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
3239 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2982 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
3240 2983
3241 /* 2984 /*
3242 * Check to see if the player is in a shop. IF so, then check to see if 2985 * Check to see if the player is in a shop. IF so, then check to see if
3243 * the player has any unpaid items. If so, remove them and put them back 2986 * the player has any unpaid items. If so, remove them and put them back
3244 * in the map. 2987 * in the map.
3245 */ 2988 */
3246 2989
3247 if (is_in_shop (op)) 2990 if (is_in_shop (op))
3248 remove_unpaid_objects (op->inv, op); 2991 remove_unpaid_objects (op->inv, op);
3249 2992
3250 /****************************************/ 2993 /****************************************/
3251 /* */ 2994 /* */
3252 /* Move player to his current respawn- */ 2995 /* Move player to his current respawn- */
3253 /* position (usually last savebed) */ 2996 /* position (usually last savebed) */
3254 /* */ 2997 /* */
3255
3256 /****************************************/ 2998 /****************************************/
3257 2999
3258 enter_player_savebed (op); 3000 enter_player_savebed (op);
3259 3001
3260 /* Save the player before inserting the force to reduce 3002 /* Save the player before inserting the force to reduce
3261 * chance of abuse. 3003 * chance of abuse.
3262 */ 3004 */
3263 op->contr->braced = 0; 3005 op->contr->braced = 0;
3264 save_player (op, 1); 3006 op->contr->save ();
3265 3007
3266 /* it is possible that the player has blown something up 3008 /* it is possible that the player has blown something up
3267 * at his savebed location, and that can have long lasting 3009 * at his savebed location, and that can have long lasting
3268 * spell effects. So first see if there is a spell effect 3010 * spell effects. So first see if there is a spell effect
3269 * on the space that might harm the player. 3011 * on the space that might harm the player.
3270 */ 3012 */
3271 will_kill_again = 0; 3013 will_kill_again = 0;
3272 for (tmp = get_map_ob (op->map, op->x, op->y); tmp; tmp = tmp->above) 3014 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
3273 {
3274 if (tmp->type == SPELL_EFFECT) 3015 if (tmp->type == SPELL_EFFECT)
3275 will_kill_again |= tmp->attacktype; 3016 will_kill_again |= tmp->attacktype;
3276 } 3017
3277 if (will_kill_again) 3018 if (will_kill_again)
3278 { 3019 {
3279 object *force; 3020 object *force;
3280 int at; 3021 int at;
3281 3022
3282 force = get_archetype (FORCE_NAME); 3023 force = get_archetype (FORCE_NAME);
3283 /* 50 ticks should be enough time for the spell to abate */ 3024 /* 50 ticks should be enough time for the spell to abate */
3284 force->speed = 0.1; 3025 force->speed = 0.1;
3285 force->speed_left = -5.0; 3026 force->speed_left = -5.0;
3286 SET_FLAG (force, FLAG_APPLIED); 3027 SET_FLAG (force, FLAG_APPLIED);
3287 for (at = 0; at < NROFATTACKS; at++) 3028 for (at = 0; at < NROFATTACKS; at++)
3288 {
3289 if (will_kill_again & (1 << at)) 3029 if (will_kill_again & (1 << at))
3290 force->resist[at] = 100; 3030 force->resist[at] = 100;
3291 } 3031
3292 insert_ob_in_ob (force, op); 3032 insert_ob_in_ob (force, op);
3293 fix_player (op); 3033 op->update_stats ();
3294 3034
3295 } 3035 }
3296 3036
3297 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED."); 3037 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");
3298 return;
3299 } /* NOT_PERMADETH */
3300 else
3301 {
3302 /* If NOT_PERMADETH is set, then the rest of this is not reachable. This
3303 * should probably be embedded in an else statement.
3304 */
3305
3306 op->contr->party = NULL;
3307 if (settings.set_title == TRUE)
3308 op->contr->own_title[0] = '\0';
3309 new_draw_info (NDI_UNIQUE | NDI_ALL, 0, NULL, buf);
3310 check_score (op);
3311 if (op->contr->ranges[range_golem] != NULL)
3312 {
3313 remove_friendly_object (op->contr->ranges[range_golem]);
3314 remove_ob (op->contr->ranges[range_golem]);
3315 free_object (op->contr->ranges[range_golem]);
3316 op->contr->ranges[range_golem] = NULL;
3317 op->contr->golem_count = 0;
3318 }
3319 loot_object (op); /* Remove some of the items for good */
3320 remove_ob (op);
3321 op->direction = 0;
3322
3323 if (!QUERY_FLAG (op, FLAG_WAS_WIZ) && op->stats.exp)
3324 {
3325 delete_character (op->name, 0);
3326 if (settings.resurrection == TRUE)
3327 {
3328 /* save playerfile sans equipment when player dies
3329 ** then save it as player.pl.dead so that future resurrection
3330 ** type spells will work on them nicely
3331 */
3332 delete_character (op->name, 0);
3333 op->stats.hp = op->stats.maxhp;
3334 op->stats.food = 999;
3335
3336 /* set the location of where the person will reappear when */
3337 /* maybe resurrection code should fix map also */
3338 strcpy (op->contr->maplevel, settings.emergency_mapname);
3339 if (op->map != NULL)
3340 op->map = NULL;
3341 op->x = settings.emergency_x;
3342 op->y = settings.emergency_y;
3343 save_player (op, 0);
3344 op->map = map;
3345 /* please see resurrection.c: peterm */
3346 dead_player (op);
3347 }
3348 else
3349 delete_character (op->name, 1);
3350 }
3351
3352 play_again (op);
3353
3354 /* peterm: added to create a corpse at deathsite. */
3355 tmp = arch_to_object (archetype::find ("corpse_pl"));
3356 sprintf (buf, "%s", &op->name);
3357 tmp->name = tmp->name_pl = buf;
3358 tmp->level = op->level;
3359 tmp->x = x;
3360 tmp->y = y;
3361 tmp->msg = gravestone_text (op);
3362 SET_FLAG (tmp, FLAG_UNIQUE);
3363 insert_ob_in_map (tmp, map, NULL, 0);
3364 }
3365} 3038}
3366
3367 3039
3368void 3040void
3369loot_object (object *op) 3041loot_object (object *op)
3370{ /* Grab and destroy some treasure */ 3042{ /* Grab and destroy some treasure */
3371 object *tmp, *tmp2, *next; 3043 object *tmp, *tmp2, *next;
3372 3044
3373 if (op->container) 3045 if (op->container)
3374 { /* close open sack first */
3375 esrv_apply_container (op, op->container); 3046 esrv_apply_container (op, op->container); /* close open sack first */
3376 }
3377 3047
3378 for (tmp = op->inv; tmp != NULL; tmp = next) 3048 for (tmp = op->inv; tmp; tmp = next)
3379 { 3049 {
3380 next = tmp->below; 3050 next = tmp->below;
3381 if (tmp->type == EXPERIENCE || tmp->invisible) 3051
3052 if (tmp->invisible)
3382 continue; 3053 continue;
3383 remove_ob (tmp); 3054
3055 tmp->remove ();
3384 tmp->x = op->x, tmp->y = op->y; 3056 tmp->x = op->x, tmp->y = op->y;
3385 if (tmp->type == CONTAINER) 3057 if (tmp->type == CONTAINER)
3386 { /* empty container to ground */ 3058 { /* empty container to ground */
3387 loot_object (tmp); 3059 loot_object (tmp);
3388 } 3060 }
3389 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 3061 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3)))
3390 { 3062 {
3391 if (tmp->nrof > 1) 3063 if (tmp->nrof > 1)
3392 { 3064 {
3393 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 3065 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3394 free_object (tmp2); 3066 tmp2->destroy ();
3395 insert_ob_in_map (tmp, op->map, NULL, 0); 3067 insert_ob_in_map (tmp, op->map, NULL, 0);
3396 } 3068 }
3397 else 3069 else
3398 free_object (tmp); 3070 tmp->destroy ();
3399 } 3071 }
3400 else 3072 else
3401 insert_ob_in_map (tmp, op->map, NULL, 0); 3073 insert_ob_in_map (tmp, op->map, NULL, 0);
3402 } 3074 }
3403} 3075}
… …
3409 */ 3081 */
3410 3082
3411void 3083void
3412fix_weight (void) 3084fix_weight (void)
3413{ 3085{
3414 player *pl; 3086 for_all_players (pl)
3415
3416 for (pl = first_player; pl != NULL; pl = pl->next)
3417 { 3087 {
3418 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 3088 int old = pl->ob->carrying, sum = sum_weight (pl->ob);
3419 3089
3420 if (old == sum) 3090 if (old == sum)
3421 continue; 3091 continue;
3422 fix_player (pl->ob); 3092 pl->ob->update_stats ();
3423 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum); 3093 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);
3424 } 3094 }
3425} 3095}
3426 3096
3427void 3097void
3428fix_luck (void) 3098fix_luck (void)
3429{ 3099{
3430 player *pl; 3100 for_all_players (pl)
3431
3432 for (pl = first_player; pl != NULL; pl = pl->next)
3433 if (!pl->ob->contr->state) 3101 if (!pl->ob->contr->ns->state)
3434 change_luck (pl->ob, 0); 3102 pl->ob->change_luck (0);
3435} 3103}
3436
3437 3104
3438/* cast_dust() - handles op throwing objects of type 'DUST'. 3105/* cast_dust() - handles op throwing objects of type 'DUST'.
3439 * This is much simpler in the new spell code - we basically 3106 * This is much simpler in the new spell code - we basically
3440 * just treat this as any other spell casting object. 3107 * just treat this as any other spell casting object.
3441 */ 3108 */
3442
3443void 3109void
3444cast_dust (object *op, object *throw_ob, int dir) 3110cast_dust (object *op, object *throw_ob, int dir)
3445{ 3111{
3446 object *skop, *spob; 3112 object *skop, *spob;
3447 3113
… …
3468 if (op->type == PLAYER) 3134 if (op->type == PLAYER)
3469 new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", &spob->name); 3135 new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", &spob->name);
3470 3136
3471 cast_spell (op, throw_ob, dir, spob, NULL); 3137 cast_spell (op, throw_ob, dir, spob, NULL);
3472 3138
3473 if (!QUERY_FLAG (throw_ob, FLAG_REMOVED)) 3139 throw_ob->destroy ();
3474 remove_ob (throw_ob);
3475 free_object (throw_ob);
3476} 3140}
3477 3141
3478void 3142void
3479make_visible (object *op) 3143make_visible (object *op)
3480{ 3144{
… …
3494 object *tmp = NULL; 3158 object *tmp = NULL;
3495 3159
3496 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3160 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3497 return 1; 3161 return 1;
3498 3162
3499 if (op->type == PLAYER)
3500 for (tmp = op->inv; tmp; tmp = tmp->below)
3501 if (tmp->type == EXPERIENCE && tmp->stats.Wis)
3502 if (QUERY_FLAG (tmp, FLAG_UNDEAD))
3503 return 1;
3504 return 0; 3163 return 0;
3505} 3164}
3506 3165
3507/* look at the surrounding terrain to determine 3166/* look at the surrounding terrain to determine
3508 * the hideability of this object. Positive levels 3167 * the hideability of this object. Positive levels
… …
3564 3223
3565 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3224 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3566 3225
3567 /* its *extremely* hard to run and sneak/hide at the same time! */ 3226 /* its *extremely* hard to run and sneak/hide at the same time! */
3568 if (op->type == PLAYER && op->contr->run_on) 3227 if (op->type == PLAYER && op->contr->run_on)
3569 {
3570 if (!skop || num >= skop->level) 3228 if (!skop || num >= skop->level)
3571 { 3229 {
3572 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!"); 3230 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3573 make_visible (op); 3231 make_visible (op);
3574 return; 3232 return;
3575 } 3233 }
3576 else 3234 else
3577 num += 20; 3235 num += 20;
3578 } 3236
3579 num += op->map->difficulty; 3237 num += op->map->difficulty;
3580 hide = hideability (op); /* modify by terrain hidden level */ 3238 hide = hideability (op); /* modify by terrain hidden level */
3581 num -= hide; 3239 num -= hide;
3240
3582 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3241 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3583 { 3242 {
3584 make_visible (op); 3243 make_visible (op);
3585 if (op->type == PLAYER) 3244 if (op->type == PLAYER)
3586 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3245 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3587 } 3246 }
3588 else if (op->type == PLAYER && skop) 3247 else if (op->type == PLAYER && skop)
3589 {
3590 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3248 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3591 }
3592} 3249}
3593 3250
3594/* determine if who is standing near a hostile creature. */ 3251/* determine if who is standing near a hostile creature. */
3595 3252
3596int 3253int
3597stand_near_hostile (object *who) 3254stand_near_hostile (object *who)
3598{ 3255{
3599 object *tmp = NULL; 3256 object *tmp = NULL;
3600 int i, friendly = 0, player = 0, mflags; 3257 int i, friendly = 0, player = 0, mflags;
3601 mapstruct *m; 3258 maptile *m;
3602 sint16 x, y; 3259 sint16 x, y;
3603 3260
3604 if (!who) 3261 if (!who)
3605 return 0; 3262 return 0;
3606 3263
… …
3623 if (mflags & P_OUT_OF_MAP) 3280 if (mflags & P_OUT_OF_MAP)
3624 continue; 3281 continue;
3625 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y))) 3282 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
3626 continue; 3283 continue;
3627 3284
3628 for (tmp = get_map_ob (m, x, y); tmp; tmp = tmp->above) 3285 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
3629 { 3286 {
3630 if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) 3287 if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
3631 return 1; 3288 return 1;
3632 else if (tmp->type == PLAYER) 3289 else if (tmp->type == PLAYER)
3633 { 3290 {
… …
3663 if (pl->type != PLAYER) 3320 if (pl->type != PLAYER)
3664 { 3321 {
3665 LOG (llevError, "player_can_view() called for non-player object\n"); 3322 LOG (llevError, "player_can_view() called for non-player object\n");
3666 return -1; 3323 return -1;
3667 } 3324 }
3325
3668 if (!pl || !op) 3326 if (!pl || !op)
3669 return 0; 3327 return 0;
3670 3328
3671 if (op->head)
3672 {
3673 op = op->head; 3329 op = op->head_ ();
3674 } 3330
3675 get_rangevector (pl, op, &rv, 0x1); 3331 get_rangevector (pl, op, &rv, 0x1);
3676 3332
3677 /* starting with the 'head' part, lets loop 3333 /* starting with the 'head' part, lets loop
3678 * through the object and find if it has any 3334 * through the object and find if it has any
3679 * part that is in the los array but isnt on 3335 * part that is in the los array but isnt on
… …
3687 3343
3688 /* only the viewable area the player sees is updated by LOS 3344 /* only the viewable area the player sees is updated by LOS
3689 * code, so we need to restrict ourselves to that range of values 3345 * code, so we need to restrict ourselves to that range of values
3690 * for any meaningful values. 3346 * for any meaningful values.
3691 */ 3347 */
3692 if (FABS (dx) <= (pl->contr->socket.mapx / 2) && 3348 if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&
3693 FABS (dy) <= (pl->contr->socket.mapy / 2) && 3349 FABS (dy) <= (pl->contr->ns->mapy / 2) &&
3694 !pl->contr->blocked_los[dx + (pl->contr->socket.mapx / 2)][dy + (pl->contr->socket.mapy / 2)]) 3350 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3695 return 1; 3351 return 1;
3696 op = op->more; 3352 op = op->more;
3697 } 3353 }
3698 return 0; 3354 return 0;
3699} 3355}
… …
3809 if (trlist == NULL || who->type != PLAYER) 3465 if (trlist == NULL || who->type != PLAYER)
3810 return; 3466 return;
3811 3467
3812 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3468 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3813 3469
3814 if (tr == NULL || tr->item == NULL) 3470 if (!tr || !tr->item)
3815 { 3471 {
3816 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3472 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3817 return; 3473 return;
3818 } 3474 }
3819 3475
… …
3885 { 3541 {
3886 /* forces in the treasurelist can alter the player's stats */ 3542 /* forces in the treasurelist can alter the player's stats */
3887 object *skin; 3543 object *skin;
3888 3544
3889 /* first get the dragon skin force */ 3545 /* first get the dragon skin force */
3546 shstr_cmp dragon_skin_force ("dragon_skin_force");
3890 for (skin = who->inv; skin != NULL && strcmp (skin->arch->name, "dragon_skin_force") != 0; skin = skin->below); 3547 for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)
3548 ;
3549
3891 if (skin == NULL) 3550 if (!skin)
3892 return; 3551 return;
3893 3552
3894 /* adding new spellpath attunements */ 3553 /* adding new spellpath attunements */
3895 if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned)) 3554 if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned))
3896 { 3555 {

Diff Legend

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