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.64 by root, Tue Dec 26 03:35:59 2006 UTC vs.
Revision 1.202 by root, Fri Aug 29 02:07:09 2008 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#include <pwd.h>
26#include <sproto.h> 25#include <sproto.h>
27#include <sounds.h> 26#include <sounds.h>
28#include <living.h> 27#include <living.h>
29#include <object.h> 28#include <object.h>
30#include <spells.h> 29#include <spells.h>
31#include <skills.h> 30#include <skills.h>
32 31
33#include <algorithm> 32#include <algorithm>
34#include <functional> 33#include <functional>
35 34
36player * 35playervec players;
37find_player (const char *plname)
38{
39 for_all_players (pl)
40 if (pl->ob && !strcmp (query_name (pl->ob), plname))
41 return pl;
42
43 return 0;
44}
45 36
46void 37void
47display_motd (const object *op) 38display_motd (const object *op)
48{ 39{
49 char buf[MAX_BUF]; 40 char buf[MAX_BUF];
… …
123 114
124 news[0] = '\0'; 115 news[0] = '\0';
125 subject[0] = '\0'; 116 subject[0] = '\0';
126 size = 0; 117 size = 0;
127 118
128 while (fgets (buf, MAX_BUF, fp) != NULL) 119 while (fgets (buf, MAX_BUF, fp))
129 { 120 {
130 if (*buf == '#') 121 if (*buf == '#')
131 continue; 122 continue;
132 123
133 if (*buf == '%') 124 if (*buf == '%')
134 { /* send one news */ 125 { /* send one news */
135 if (size > 0) 126 if (size > 0)
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 */ 127 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
128 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS,
129 "INFORMATION: %s\n%s", (char *)"%s\n%s",
130 subject, news); /*send previously read news */
131
137 strcpy (subject, buf + 1); 132 strcpy (subject, buf + 1);
138 strip_endline (subject); 133 strip_endline (subject);
139 size = 0; 134 size = 0;
140 news[0] = '\0'; 135 news[0] = '\0';
141 } 136 }
… …
150 size += strlen (buf); 145 size += strlen (buf);
151 } 146 }
152 } 147 }
153 148
154 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 149 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
155 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news); 150 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
156 close_and_delete (fp, comp); 151 close_and_delete (fp, comp);
157} 152}
158 153
159/* This loads the first map an puts the player on it. */ 154/* This loads the first map an puts the player on it. */
160static void 155static void
161set_first_map (object *op) 156set_first_map (object *op)
162{ 157{
163 strcpy (op->contr->maplevel, first_map_path); 158 op->contr->maplevel = first_map_path;
164 op->x = -1; 159 op->x = -1;
165 op->y = -1; 160 op->y = -1;
166 enter_exit (op, 0); 161}
162
163void
164player::activate ()
165{
166 if (active)
167 return;
168
169 players.insert (this);
170 ob->remove ();
171 ob->map = 0;
172 ob->activate_recursive ();
173 CLEAR_FLAG (ob, FLAG_FRIENDLY);
174 add_friendly_object (ob);
175}
176
177void
178player::deactivate ()
179{
180 if (!active)
181 return;
182
183 terminate_all_pets (ob);
184 remove_friendly_object (ob);
185 ob->deactivate_recursive ();
186
187 if (ob->map)
188 maplevel = ob->map->path;
189
190 ob->remove ();
191 ob->enemy = 0; // sometimes keeps an extra refcount on itself
192 ob->map = 0;
193 party = 0;
194
195 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
196
197 players.erase (this);
167} 198}
168 199
169// connect the player with a specific client 200// connect the player with a specific client
170// also changed, rationalises, and fixes some incorrect settings 201// also changes, rationalises, and fixes some incorrect settings
171void 202void
172player::connect (client *ns) 203player::connect (client *ns)
173{ 204{
174 this->ns = ns; 205 this->ns = ns;
175 ns->pl = this; 206 ns->pl = this;
176 207
177 next = first_player; 208 run_on = 0;
178 first_player = this; 209 fire_on = 0;
210 ob->close_container (); //TODO: client-specific
179 211
180 ns->update_look = 0; 212 ns->update_look = 0;
181 ns->look_position = 0; 213 ns->look_position = 0;
182 214
183 clear_los (ob); 215 clear_los (this);
216
217 ns->reset_stats ();
184 218
185 /* make sure he's a player -- needed because of class change. */ 219 /* make sure he's a player -- needed because of class change. */
186 ob->type = PLAYER; // we are paranoid 220 ob->type = PLAYER; // we are paranoid
187 ob->race = ob->arch->clone.race; 221 ob->race = ob->arch->race;
188 222
189 if (!legal_range (ob, shoottype)) 223 ob->update_weight ();
190 shoottype = range_none;
191
192 ob->carrying = sum_weight (ob);
193 link_player_skills (ob); 224 link_player_skills (ob);
194 225
195 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 226 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
196 update_ob_speed (ob);
197 227
198 assign (title, ob->arch->clone.name); 228 assign (title, ob->arch->object::name);
199
200 /* can_use_shield is a new flag. However, the can_use.. seems to largely come
201 * from the class, and not race. I don't see any way to get the class information
202 * to then update this. I don't think this will actually break anything - anyone
203 * that can use armour should be able to use a shield. What this may 'break'
204 * are features new characters get, eg, if someone starts up with a Q, they
205 * should be able to use a shield. However, old Q's won't get that advantage.
206 */
207 if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
208 SET_FLAG (ob, FLAG_USE_SHIELD);
209 229
210 /* if it's a dragon player, set the correct title here */ 230 /* if it's a dragon player, set the correct title here */
211 if (is_dragon_pl (ob)) 231 if (is_dragon_pl (ob))
212 { 232 {
213 object *tmp, *abil = 0, *skin = 0; 233 object *tmp, *abil = 0, *skin = 0;
214 234
215 shstr_cmp dragon_ability_force ("dragon_ability_force");
216 shstr_cmp dragon_skin_force ("dragon_skin_force");
217
218 for (tmp = ob->inv; tmp; tmp = tmp->below) 235 for (tmp = ob->inv; tmp; tmp = tmp->below)
219 if (tmp->type == FORCE) 236 if (tmp->type == FORCE)
220 if (tmp->arch->name == dragon_ability_force) 237 if (tmp->arch->archname == shstr_dragon_ability_force)
221 abil = tmp; 238 abil = tmp;
222 else if (tmp->arch->name == dragon_skin_force) 239 else if (tmp->arch->archname == shstr_dragon_skin_force)
223 skin = tmp; 240 skin = tmp;
224 241
225 set_dragon_name (ob, abil, skin); 242 set_dragon_name (ob, abil, skin);
226 } 243 }
227 244
228 CLEAR_FLAG (ob, FLAG_FRIENDLY);
229 add_friendly_object (ob);
230
231 LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
232
233 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 245 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
234 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &ob->name);
235 246
236 esrv_new_player (this, ob->weight + ob->carrying); 247 esrv_new_player (this);
237 248
238 ob->update_stats (); 249 ob->update_stats ();
250
239 ns->floorbox_update (); 251 ns->floorbox_update ();
240
241 esrv_send_inventory (ob, ob); 252 esrv_send_inventory (ob, ob);
242 esrv_add_spells (this, 0); 253 esrv_add_spells (this, 0);
243 254
244 enter_exit (ob, 0); 255 activate ();
245 256
246 send_rules (ob); 257 send_rules (ob);
247 send_news (ob); 258 send_news (ob);
248 display_motd (ob); 259 display_motd (ob);
260
261 INVOKE_PLAYER (CONNECT, this);
249 INVOKE_PLAYER (LOGIN, this); 262 INVOKE_PLAYER (LOGIN, this);
250} 263}
251 264
252void 265void
253player::disconnect () 266player::disconnect ()
254{ 267{
255 //TODO: don't be so harsh and destroy :) 268 if (ob)
269 {
270 ob->close_container (); //TODO: client-specific
271 ob->drop_unpaid_items ();
272 }
273
256 if (ns) 274 if (ns)
257 destroy (); 275 {
276 if (active)
277 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
278
279 INVOKE_PLAYER (DISCONNECT, this);
280
281 ns->reset_stats ();
282 ns->pl = 0;
283 ns = 0;
284 }
285
286 observe = ob;
287
288 deactivate ();
258} 289}
259 290
260// the need for this function can be explained 291// the need for this function can be explained
261// by load_object not returning the object 292// by load_object not returning the object
262void 293void
263player::set_object (object *op) 294player::set_object (object *op)
264{ 295{
265 ob = op; 296 ob = observe = op;
266 ob->contr = this; /* this aren't yet in archetype */ 297 ob->contr = this; /* this aren't yet in archetype */
267 298
299 ob->speed = 1.0f;
268 ob->speed_left = 0.5; 300 ob->speed_left = 0.5f;
269 ob->speed = 1.0; 301
270 ob->direction = 5; /* So player faces south */ 302 ob->direction = 5; /* So player faces south */
271 ob->stats.wc = 2;
272 ob->run_away = 25; /* Then we panick... */
273 303
274 set_first_map (ob); 304 ob->flag [FLAG_READY_WEAPON] = false;
305 ob->flag [FLAG_READY_SKILL] = false;
306 ob->flag [FLAG_READY_BOW] = false;
275 307
276 ob->roll_stats (); 308 for (object *op = ob->inv; op; op = op->below)
309 if (op->flag [FLAG_APPLIED])
310 switch (op->type)
311 {
312 case SKILL:
313 ob->flag [FLAG_APPLIED] = false;
314 break;
315
316 case WAND:
317 case ROD:
318 case HORN:
319 case BOW:
320 ranged_ob = op;
321 break;
322
323 case WEAPON:
324 combat_ob = op;
325 break;
326 }
327
328 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
329 ob->deactivate (); // change_weapon activates, fix this better
330}
331
332void
333player::set_observe (object *op)
334{
335 observe = op ? op : ob;
336 do_los = 1;
277} 337}
278 338
279player::player () 339player::player ()
280{ 340{
281 /* There are some elements we want initialized to non zero value - 341 /* There are some elements we want initialised to non zero value -
282 * we deal with that below this point. 342 * we deal with that below this point.
283 */ 343 */
284 outputs_sync = 16; /* Every 2 seconds */ 344 outputs_sync = 4;
285 outputs_count = 8; /* Keeps present behaviour */ 345 outputs_count = 4;
286 unapply = unapply_nochoice; 346 unapply = unapply_nochoice;
287 347
288 assign (savebed_map, first_map_path); /* Init. respawn position */ 348 savebed_map = first_map_path; /* Init. respawn position */
289 349
290 gen_sp_armour = 10; 350 gen_sp_armour = 10;
291 last_speed = -1;
292 shoottype = range_none;
293 bowtype = bow_normal; 351 bowtype = bow_normal;
294 petmode = pet_normal; 352 petmode = pet_normal;
295 listening = 10;
296 usekeys = containers; 353 usekeys = containers;
297 last_weapon_sp = -1;
298 peaceful = 1; /* default peaceful */ 354 peaceful = 1; /* default peaceful */
299 do_los = 1; 355 do_los = 1;
300 356
301 /* we need to clear these to -1 and not zero - otherwise, 357 weapon_sp = 1.0f;
302 * if a player quits and starts a new character, we wont 358 weapon_sp_left = 0.5f;
303 * send new values to the client, as things like exp start
304 * at zero.
305 */
306 for (int i = 0; i < NUM_SKILLS; i++)
307 last_skill_exp[i] = -1;
308
309 for (int i = 0; i < NROFATTACKS; i++)
310 last_resist[i] = -1;
311
312 last_stats.exp = -1;
313 last_weight = (uint32) - 1;
314} 359}
315 360
316void 361void
317player::do_destroy () 362player::do_destroy ()
318{ 363{
364 disconnect ();
365
319 attachable::do_destroy (); 366 attachable::do_destroy ();
320 367
321 disconnect ();
322
323 terminate_all_pets (ob);
324
325 if (first_player != this)
326 {
327 player *prev = first_player;
328
329 while (prev && prev->next && prev->next != this)
330 prev = prev->next;
331
332 if (prev->next != this)
333 {
334 LOG (llevError, "Free_player: Can't find previous player.\n");
335 abort ();
336 }
337
338 prev->next = next;
339 }
340 else
341 first_player = next;
342
343 if (ob) 368 if (ob)
369 {
344 ob->destroy (true); 370 ob->destroy_inv (false);
345
346 if (ns)
347 {
348 client *ns = this->ns;
349 ns->send_packet ("goodbye");
350 ns->flush ();
351 ns->pl = 0;
352 this->ns = 0;
353 ns->destroy (); 371 ob->destroy ();
354 } 372 }
373
374 ob = observe = 0;
355} 375}
356 376
357player::~player () 377player::~player ()
358{ 378{
359 /* Clear item stack */ 379 /* Clear item stack */
… …
368player::create () 388player::create ()
369{ 389{
370 player *pl = new player; 390 player *pl = new player;
371 391
372 pl->set_object (arch_to_object (get_player_archetype (0))); 392 pl->set_object (arch_to_object (get_player_archetype (0)));
393
394 pl->ob->roll_stats ();
395 pl->ob->stats.wc = 2;
396 pl->ob->run_away = 25; /* Then we panick... */
397
398 set_first_map (pl->ob);
373 399
374 return pl; 400 return pl;
375} 401}
376 402
377/* 403/*
… …
380 * Note: there MUST be at least one player archetype! 406 * Note: there MUST be at least one player archetype!
381 */ 407 */
382archetype * 408archetype *
383get_player_archetype (archetype *at) 409get_player_archetype (archetype *at)
384{ 410{
385 archetype *start = at; 411 // archetypes could have been reloaded
412 archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
413
414 if (!nat)
415 return at;
416
417 archvec::iterator i = archetypes.find (nat);
386 418
387 for (;;) 419 for (;;)
388 { 420 {
389 if (at == NULL || at->next == NULL) 421 if (++i == archetypes.end ())
390 at = first_archetype; 422 i = archetypes.begin ();
391 else 423 else if (*i == at)
392 at = at->next; 424 cleanup ("not a single player archetype found");
393 425
394 if (at->clone.type == PLAYER) 426 if ((*i)->type == PLAYER)
395 return at; 427 return *i;
396
397 if (at == start)
398 {
399 LOG (llevError, "No Player archetypes\n");
400 exit (-1);
401 }
402 } 428 }
403} 429}
404 430
405object * 431object *
406get_nearest_player (object *mon) 432get_nearest_player (object *mon)
… …
408 object *op = NULL; 434 object *op = NULL;
409 objectlink *ol; 435 objectlink *ol;
410 unsigned lastdist; 436 unsigned lastdist;
411 rv_vector rv; 437 rv_vector rv;
412 438
413 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 439 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
414 { 440 {
415 /* We should not find free objects on this friendly list, but it
416 * does periodically happen. Given that, lets deal with it.
417 * While unlikely, it is possible the next object on the friendly
418 * list is also free, so encapsulate this in a while loop.
419 */
420 while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
421 {
422 object *tmp = ol->ob;
423
424 /* Can't do much more other than log the fact, because the object
425 * itself will have been cleared.
426 */
427 LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n");
428 ol = ol->next;
429 remove_friendly_object (tmp);
430 if (!ol)
431 return op;
432 }
433
434 /* Remove special check for player from this. First, it looks to cause
435 * some crashes (ol->ob->contr not set properly?), but secondly, a more
436 * complicated method of state checking would be needed in any case -
437 * as it was, a clever player could type quit, and the function would
438 * skip them over while waiting for confirmation. Remove
439 * on_same_map check, as can_detect_enemy also does this
440 */
441 if (!can_detect_enemy (mon, ol->ob, &rv)) 441 if (!can_detect_enemy (mon, ol->ob, &rv))
442 continue; 442 continue;
443 443
444 if (lastdist > rv.distance) 444 if (lastdist > rv.distance)
445 { 445 {
… …
521 x = mon->x; 521 x = mon->x;
522 y = mon->y; 522 y = mon->y;
523 m = mon->map; 523 m = mon->map;
524 dir = rv.direction; 524 dir = rv.direction;
525 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 525 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
526 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 526 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
527
527 /* If we can't solve it within the search distance, return now. */ 528 /* If we can't solve it within the search distance, return now. */
528 if (diff > max) 529 if (diff > max)
529 return 0; 530 return 0;
531
530 while (diff > 1 && max > 0) 532 while (diff > 1 && max > 0)
531 { 533 {
532 lastx = x; 534 lastx = x;
533 lasty = y; 535 lasty = y;
534 lastmap = m; 536 lastmap = m;
… …
616 max--; 618 max--;
617 lastdir = dir; 619 lastdir = dir;
618 if (!firstdir) 620 if (!firstdir)
619 firstdir = dir; 621 firstdir = dir;
620 } 622 }
623
621 if (diff <= 1) 624 if (diff <= 1)
622 { 625 {
623 /* Recalculate diff (distance) because we may not have actually 626 /* Recalculate diff (distance) because we may not have actually
624 * headed toward player for entire distance. 627 * headed toward player for entire distance.
625 */ 628 */
626 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 629 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
627 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 630 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
628 } 631 }
632
629 if (diff > max) 633 if (diff > max)
630 return 0; 634 return 0;
631 } 635 }
636
632 /* If we reached the max, didn't find a direction in time */ 637 /* If we reached the max, didn't find a direction in time */
633 if (!max) 638 if (!max)
634 return 0; 639 return 0;
635 640
636 return firstdir; 641 return firstdir;
637} 642}
638 643
639void 644void
640give_initial_items (object *pl, treasurelist * items) 645give_initial_items (object *pl, treasurelist *items)
641{ 646{
642 object *op, *next = NULL;
643
644 if (pl->randomitems != NULL) 647 if (pl->randomitems)
645 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0); 648 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
646 649
647 for (op = pl->inv; op; op = next) 650 for (object *next, *op = pl->inv; op; op = next)
648 { 651 {
649 next = op->below; 652 next = op->below;
650 653
651 /* Forces get applied per default, unless they have the 654 /* Forces get applied per default, unless they have the
652 * flag "neutral" set. Sorry but I can't think of a better way 655 * flag "neutral" set. Sorry but I can't think of a better way
… …
657 /* we never give weapons/armour if these cannot be used 660 /* we never give weapons/armour if these cannot be used
658 * by this player due to race restrictions 661 * by this player due to race restrictions
659 */ 662 */
660 if (pl->type == PLAYER) 663 if (pl->type == PLAYER)
661 { 664 {
662 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) && 665 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
666 &&
663 (op->type == ARMOUR || op->type == BOOTS || 667 (op->type == ARMOUR || op->type == BOOTS
664 op->type == CLOAK || op->type == HELMET || 668 || op->type == CLOAK || op->type == HELMET
665 op->type == SHIELD || op->type == GLOVES || 669 || op->type == SHIELD || op->type == GLOVES
670 || op->type == BRACERS || op->type == GIRDLE))
666 op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 671 || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
667 { 672 {
668 op->destroy (); 673 op->destroy ();
669 continue; 674 continue;
670 } 675 }
671 } 676 }
… …
694 if (op->nrof > 1) 699 if (op->nrof > 1)
695 op->nrof = 1; 700 op->nrof = 1;
696 } 701 }
697 702
698 if (op->type == SPELLBOOK && op->inv) 703 if (op->type == SPELLBOOK && op->inv)
699 {
700 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 704 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
701 }
702 705
703 /* Give starting characters identified, uncursed, and undamned 706 /* Give starting characters identified, uncursed, and undamned
704 * items. Just don't identify gold or silver, or it won't be 707 * items. Just don't identify gold or silver, or it won't be
705 * merged properly. 708 * merged properly.
706 */ 709 */
707 if (need_identify (op)) 710 if (need_identify (op))
708 { 711 {
709 SET_FLAG (op, FLAG_IDENTIFIED); 712 SET_FLAG (op, FLAG_IDENTIFIED);
710 CLEAR_FLAG (op, FLAG_CURSED); 713 CLEAR_FLAG (op, FLAG_CURSED);
711 CLEAR_FLAG (op, FLAG_DAMNED); 714 CLEAR_FLAG (op, FLAG_DAMNED);
712 } 715 }
716
713 if (op->type == SPELL) 717 if (op->type == SPELL)
714 { 718 {
715 op->destroy (); 719 op->destroy ();
716 continue; 720 continue;
717 } 721 }
… …
719 { 723 {
720 SET_FLAG (op, FLAG_CAN_USE_SKILL); 724 SET_FLAG (op, FLAG_CAN_USE_SKILL);
721 op->stats.exp = 0; 725 op->stats.exp = 0;
722 op->level = 1; 726 op->level = 1;
723 } 727 }
724 /* lock all 'normal items by default */ 728 else /* lock all 'normal items by default */
725 else
726 SET_FLAG (op, FLAG_INV_LOCKED); 729 SET_FLAG (op, FLAG_INV_LOCKED);
727 } /* for loop of objects in player inv */ 730 } /* for loop of objects in player inv */
728 731
729 /* Need to set up the skill pointers */ 732 /* Need to set up the skill pointers */
730 link_player_skills (pl); 733 link_player_skills (pl);
… …
750roll_stat (void) 753roll_stat (void)
751{ 754{
752 int a[4], i, j, k; 755 int a[4], i, j, k;
753 756
754 for (i = 0; i < 4; i++) 757 for (i = 0; i < 4; i++)
755 a[i] = (int) RANDOM () % 6 + 1; 758 a[i] = (int) rndm (6) + 1;
756 759
757 for (i = 0, j = 0, k = 7; i < 4; i++) 760 for (i = 0, j = 0, k = 7; i < 4; i++)
758 if (a[i] < k) 761 if (a[i] < k)
759 k = a[i], j = i; 762 k = a[i], j = i;
760 763
… …
766} 769}
767 770
768void 771void
769object::roll_stats () 772object::roll_stats ()
770{ 773{
771 int statsort [7]; 774 int statsort [NUM_STATS];
772 775
773 for (;;) 776 for (;;)
774 { 777 {
775 int sum = 0; 778 int sum = 0;
776 for (int i = 7; i--; ) 779 for (int i = NUM_STATS; i--; )
777 sum += statsort [i] = roll_stat (); 780 sum += statsort [i] = roll_stat ();
778 781
779 if (sum >= 82 && sum <= 116) 782 if (sum >= 82 && sum <= 116)
780 break; 783 break;
781 } 784 }
782 785
783 // Sort the stats so that rerolling is easier... 786 // Sort the stats so that rerolling is easier...
784 std::sort (statsort, statsort + 7, std::greater<int>()); 787 std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
785 788
789 for (int i = 0; i < NUM_STATS; ++i)
786 stats.Str = statsort[0]; 790 stats.stat (i) = statsort [i];
787 stats.Dex = statsort[1];
788 stats.Con = statsort[2];
789 stats.Int = statsort[3];
790 stats.Wis = statsort[4];
791 stats.Pow = statsort[5];
792 stats.Cha = statsort[6];
793 791
794 stats.exp = 0; 792 stats.exp = 0;
795 stats.ac = 0; 793 stats.ac = 0;
796 794
797 stats.hp = stats.maxhp; 795 stats.hp = stats.maxhp;
… …
809} 807}
810 808
811void 809void
812object::swap_stats (int a, int b) 810object::swap_stats (int a, int b)
813{ 811{
814 int tmp = get_attr_value (&contr->orig_stats, a); 812 swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
815 set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
816 set_attr_value (&contr->orig_stats, b, tmp);
817 813
814 for (int i = 0; i < NUM_STATS; ++i)
818 stats.Str = contr->orig_stats.Str; 815 stats.stat (i) = contr->orig_stats.stat (i);
819 stats.Dex = contr->orig_stats.Dex;
820 stats.Con = contr->orig_stats.Con;
821 stats.Int = contr->orig_stats.Int;
822 stats.Wis = contr->orig_stats.Wis;
823 stats.Pow = contr->orig_stats.Pow;
824 stats.Cha = contr->orig_stats.Cha;
825 816
826 //TODO: the following code looks so borked and should, at the very least, 817 //TODO: the following code looks so borked and should, at the very least,
827 // be merged with the similar code in roll_stats 818 // be merged with the similar code in roll_stats
828 stats.ac = 0; 819 stats.ac = 0;
829 820
… …
841 contr->levsp[1] = 6; 832 contr->levsp[1] = 6;
842 contr->levgrace[1] = 3; 833 contr->levgrace[1] = 3;
843 834
844 contr->orig_stats = stats; 835 contr->orig_stats = stats;
845 } 836 }
837}
838
839static void
840start_info (object *op)
841{
842 char buf[MAX_BUF];
843
844 sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
845 new_draw_info (NDI_UNIQUE, 0, op, buf);
846} 846}
847 847
848/* This function takes the key that is passed, and does the 848/* This function takes the key that is passed, and does the
849 * appropriate action with it (change race, or other things). 849 * appropriate action with it (change race, or other things).
850 * The function name is for historical reasons - now we have 850 * The function name is for historical reasons - now we have
851 * separate race and class; this actually changes the RACE, 851 * separate race and class; this actually changes the RACE,
852 * not the class. 852 * not the class.
853 */ 853 */
854int 854void
855key_change_class (object *op, char key) 855player::chargen_race_done ()
856{ 856{
857 int tmp_loop;
858
859 if (key == 'd' || key == 'D')
860 {
861 char buf[MAX_BUF];
862
863 /* this must before then initial items are given */ 857 /* this must before then initial items are given */
864 esrv_new_player (op->contr, op->weight + op->carrying); 858 esrv_new_player (ob->contr);
865 859
866 treasurelist *tl = find_treasurelist ("starting_wealth"); 860 treasurelist *tl = treasurelist::find ("starting_wealth");
867 if (tl) 861 if (tl)
868 create_treasure (tl, op, 0, 0, 0); 862 create_treasure (tl, ob, 0, 0, 0);
869 863
870 INVOKE_PLAYER (BIRTH, op->contr); 864 INVOKE_PLAYER (BIRTH, ob->contr);
871 INVOKE_PLAYER (LOGIN, op->contr); 865 INVOKE_PLAYER (LOGIN, ob->contr);
872 866
873 op->contr->ns->state = ST_PLAYING; 867 ob->contr->ns->state = ST_PLAYING;
874 868
875 if (op->msg) 869 if (ob->msg)
876 op->msg = NULL; 870 ob->msg = 0;
877 871
878 /* We create this now because some of the unique maps will need it
879 * to save here.
880 */
881 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);
882 make_path_to_file (buf);
883
884#ifdef AUTOSAVE
885 op->contr->last_save_tick = pticks;
886#endif
887 start_info (op); 872 start_info (ob);
888 CLEAR_FLAG (op, FLAG_WIZ); 873 CLEAR_FLAG (ob, FLAG_WIZ);
889 give_initial_items (op, op->randomitems); 874 give_initial_items (ob, ob->randomitems);
890 link_player_skills (op); 875 link_player_skills (ob);
891 esrv_send_inventory (op, op); 876 esrv_send_inventory (ob, ob);
892 op->update_stats (); 877 ob->update_stats ();
893 878
894 /* This moves the player to a different start map, if there 879 /* This moves the player to a different start map, if there
895 * is one for this race 880 * is one for this race
896 */ 881 */
897 if (*first_map_ext_path) 882 if (*first_map_ext_path)
898 { 883 ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
899 object *tmp;
900 char mapname[MAX_BUF];
901
902 snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name);
903 tmp = object::create ();
904 EXIT_PATH (tmp) = mapname;
905 EXIT_X (tmp) = op->x;
906 EXIT_Y (tmp) = op->y;
907 enter_exit (op, tmp); /* we don't really care if it succeeded;
908 * if the map isn't there, then stay on the
909 * default initial map */
910 tmp->destroy ();
911 }
912 else 884 else
913 LOG (llevDebug, "first_map_ext_path not set\n"); 885 LOG (llevDebug, "first_map_ext_path not set\n");
886}
914 887
915 return 0; 888void
916 } 889player::chargen_race_next ()
917 890{
918 /* Following actually changes the race - this is the default command 891 /* Following actually changes the race - this is the default command
919 * if we don't match with one of the options above. 892 * if we don't match with one of the options above.
920 */ 893 */
921 894
922 tmp_loop = 0; 895 do
923 while (!tmp_loop)
924 { 896 {
925 shstr name = op->name; 897 shstr name = ob->name;
926 int x = op->x, y = op->y; 898 int x = ob->x, y = ob->y;
927 899
928 op->remove_statbonus (); 900 ob->remove_statbonus ();
929 op->remove (); 901 ob->remove ();
930 op->arch = get_player_archetype (op->arch); 902 ob->arch = get_player_archetype (ob->arch);
931 op->arch->clone.copy_to (op); 903 ob->arch->copy_to (ob);
932 op->instantiate (); 904 ob->instantiate ();
933 op->stats = op->contr->orig_stats; 905 ob->stats = ob->contr->orig_stats;
934 op->name = op->name_pl = name; 906 ob->name = ob->name_pl = name;
935 op->x = x; 907 ob->x = x;
936 op->y = y; 908 ob->y = y;
937 SET_ANIMATION (op, 2); /* So player faces south */ 909 SET_ANIMATION (ob, 2); /* So player faces south */
938 insert_ob_in_map (op, op->map, op, 0); 910 insert_ob_in_map (ob, ob->map, ob, 0);
939 assign (op->contr->title, op->arch->clone.name); 911 assign (ob->contr->title, ob->arch->object::name);
940 op->add_statbonus (); 912 ob->add_statbonus ();
941 tmp_loop = allowed_class (op);
942 } 913 }
914 while (!allowed_class (ob));
943 915
944 update_object (op, UP_OBJ_FACE); 916 update_object (ob, UP_OBJ_FACE);
945 esrv_update_item (UPD_FACE, op, op); 917 esrv_update_item (UPD_FACE, ob, ob);
946 op->update_stats (); 918 ob->update_stats ();
947 op->stats.hp = op->stats.maxhp; 919 ob->stats.hp = ob->stats.maxhp;
948 op->stats.sp = op->stats.maxsp; 920 ob->stats.sp = ob->stats.maxsp;
949 op->stats.grace = 0; 921 ob->stats.grace = 0;
950
951 if (op->msg)
952 new_draw_info (NDI_BLUE, 0, op, op->msg);
953
954 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
955 return 0;
956}
957
958int
959key_confirm_quit (object *op, char key)
960{
961 if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
962 {
963 op->contr->ns->state = ST_PLAYING;
964 new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
965 return 1;
966 }
967
968 INVOKE_PLAYER (LOGOUT, op->contr);
969 INVOKE_PLAYER (QUIT, op->contr);
970
971 terminate_all_pets (op);
972 leave_map (op);
973 op->direction = 0;
974 new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
975
976 strcpy (op->contr->killer, "quit");
977 check_score (op);
978 op->contr->party = 0;
979 op->contr->own_title[0] = '\0';
980
981 object_ptr ob = op;
982
983 delete ob->contr;
984
985 /* We need to hunt for any per player unique maps in memory and
986 * get rid of them. The trailing slash in the path is intentional,
987 * so that players named 'Ab' won't match against players 'Abe' pathname
988 */
989 char buf[MAX_BUF];
990 sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
991
992 for (maptile *next, *mp = first_map; mp; mp = next)
993 {
994 next = mp->next;
995
996 if (!strncmp (mp->path, buf, strlen (buf)))
997 delete_map (mp);
998 }
999
1000 delete_character (ob->name, 1);
1001
1002 return 1;
1003} 922}
1004 923
1005void 924void
1006flee_player (object *op) 925flee_player (object *op)
1007{ 926{
… …
1054 /* Cornered, get rid of scared */ 973 /* Cornered, get rid of scared */
1055 CLEAR_FLAG (op, FLAG_SCARED); 974 CLEAR_FLAG (op, FLAG_SCARED);
1056 op->enemy = NULL; 975 op->enemy = NULL;
1057} 976}
1058 977
1059
1060/* check_pick sees if there is stuff to be picked up/picks up stuff. 978/* check_pick sees if there is stuff to be picked up/picks up stuff.
1061 * IT returns 1 if the player should keep on moving, 0 if he should 979 * It returns 1 if the player should keep on moving, 0 if he should
1062 * stop. 980 * stop.
1063 */ 981 */
1064int 982int
1065check_pick (object *op) 983check_pick (object *op)
1066{ 984{
1067 object *tmp, *next; 985 object *tmp, *next;
1068 int stop = 0; 986 int stop = 0;
1069 int j, k, wvratio; 987 int wvratio;
1070 char putstring[128], tmpstr[16]; 988 char putstring[128];
1071 989
1072 /* if you're flying, you cna't pick up anything */ 990 /* if you're flying, you cna't pick up anything */
1073 if (op->move_type & MOVE_FLYING) 991 if (op->move_type & MOVE_FLYING)
1074 return 1; 992 return 1;
1075 993
1076 next = op->below; 994 next = op->below;
1077 995
996 int cnt = MAX_ITEM_PER_DROP;
997#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
998
1078 /* loop while there are items on the floor that are not marked as 999 /* loop while there are items on the floor that are not marked as
1079 * destroyed */ 1000 * destroyed */
1080 while (next && !next->destroyed ()) 1001 while (next && !next->destroyed ())
1081 { 1002 {
1082 tmp = next; 1003 tmp = next;
1083 next = tmp->below; 1004 next = tmp->below;
1084 1005
1006 if (cnt <= 0)
1007 {
1008 op->failmsg ("Couldn't pickup all items at once.");
1009 return 0;
1010 }
1011
1085 if (op->destroyed ()) 1012 if (op->destroyed ())
1086 return 0; 1013 return 0;
1087 1014
1088 if (!can_pick (op, tmp)) 1015 if (!can_pick (op, tmp))
1089 continue; 1016 continue;
1090 1017
1091 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) 1018 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1092 { 1019 {
1093 if (item_matched_string (op, tmp, op->contr->search_str)) 1020 if (item_matched_string (op, tmp, op->contr->search_str))
1094 pick_up (op, tmp); 1021 CHK_PICK_PICKUP;
1095 continue; 1022 continue;
1096 } 1023 }
1097 1024
1098 /* high not bit set? We're using the old autopickup model */ 1025 /* high not bit set? We're using the old autopickup model */
1099 if (!(op->contr->mode & PU_NEWMODE)) 1026 if (!(op->contr->mode & PU_NEWMODE))
… …
1101 switch (op->contr->mode) 1028 switch (op->contr->mode)
1102 { 1029 {
1103 case 0: 1030 case 0:
1104 return 1; /* don't pick up */ 1031 return 1; /* don't pick up */
1105 case 1: 1032 case 1:
1106 pick_up (op, tmp); 1033 CHK_PICK_PICKUP;
1107 return 1; 1034 return 1;
1108 case 2: 1035 case 2:
1109 pick_up (op, tmp); 1036 CHK_PICK_PICKUP;
1110 return 0; 1037 return 0;
1111 case 3: 1038 case 3:
1112 return 0; /* stop before pickup */ 1039 return 0; /* stop before pickup */
1113 case 4: 1040 case 4:
1114 pick_up (op, tmp); 1041 CHK_PICK_PICKUP;
1115 break; 1042 break;
1116 case 5: 1043 case 5:
1117 pick_up (op, tmp); 1044 CHK_PICK_PICKUP;
1118 stop = 1; 1045 stop = 1;
1119 break; 1046 break;
1120 case 6: 1047 case 6:
1121 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1048 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1122 pick_up (op, tmp); 1049 && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1050 CHK_PICK_PICKUP;
1123 break; 1051 break;
1124 1052
1125 case 7: 1053 case 7:
1126 if (tmp->type == MONEY || tmp->type == GEM) 1054 if (tmp->type == MONEY || tmp->type == GEM)
1127 pick_up (op, tmp); 1055 CHK_PICK_PICKUP;
1128 break; 1056 break;
1129 1057
1130 default: 1058 default:
1131 /* use value density */ 1059 /* use value density */
1132 if (!QUERY_FLAG (tmp, FLAG_UNPAID) 1060 if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1133 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode) 1061 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1134 pick_up (op, tmp); 1062 CHK_PICK_PICKUP;
1135 } 1063 }
1136 } 1064 }
1137 else 1065 else
1138 { /* old model */ 1066 { /* old model */
1139 /* NEW pickup handling */ 1067 /* NEW pickup handling */
… …
1143 if (tmp->name != NULL) 1071 if (tmp->name != NULL)
1144 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1072 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1145 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1073 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1146 else 1074 else
1147 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1075 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1148 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1076 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1149 1077
1150 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1078 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1151 } 1079 }
1152 1080
1153 /* philosophy: 1081 /* philosophy:
… …
1194 /* all food and drink if desired */ 1122 /* all food and drink if desired */
1195 /* question: don't pick up known-poisonous stuff? */ 1123 /* question: don't pick up known-poisonous stuff? */
1196 if (op->contr->mode & PU_FOOD) 1124 if (op->contr->mode & PU_FOOD)
1197 if (tmp->type == FOOD) 1125 if (tmp->type == FOOD)
1198 { 1126 {
1199 pick_up (op, tmp); 1127 CHK_PICK_PICKUP;
1200 continue; 1128 continue;
1201 } 1129 }
1202 1130
1203 if (op->contr->mode & PU_DRINK) 1131 if (op->contr->mode & PU_DRINK)
1204 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 1132 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1205 { 1133 {
1206 pick_up (op, tmp); 1134 CHK_PICK_PICKUP;
1207 continue; 1135 continue;
1208 } 1136 }
1209 1137
1210 if (op->contr->mode & PU_POTION) 1138 if (op->contr->mode & PU_POTION)
1211 if (tmp->type == POTION) 1139 if (tmp->type == POTION)
1212 { 1140 {
1213 pick_up (op, tmp); 1141 CHK_PICK_PICKUP;
1214 continue; 1142 continue;
1215 } 1143 }
1216 1144
1217 /* spellbooks, skillscrolls and normal books/scrolls */ 1145 /* spellbooks, skillscrolls and normal books/scrolls */
1218 if (op->contr->mode & PU_SPELLBOOK) 1146 if (op->contr->mode & PU_SPELLBOOK)
1219 if (tmp->type == SPELLBOOK) 1147 if (tmp->type == SPELLBOOK)
1220 { 1148 {
1221 pick_up (op, tmp); 1149 CHK_PICK_PICKUP;
1222 continue; 1150 continue;
1223 } 1151 }
1224 1152
1225 if (op->contr->mode & PU_SKILLSCROLL) 1153 if (op->contr->mode & PU_SKILLSCROLL)
1226 if (tmp->type == SKILLSCROLL) 1154 if (tmp->type == SKILLSCROLL)
1227 { 1155 {
1228 pick_up (op, tmp); 1156 CHK_PICK_PICKUP;
1229 continue; 1157 continue;
1230 } 1158 }
1231 1159
1232 if (op->contr->mode & PU_READABLES) 1160 if (op->contr->mode & PU_READABLES)
1233 if (tmp->type == BOOK || tmp->type == SCROLL) 1161 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1234 { 1162 {
1235 pick_up (op, tmp); 1163 CHK_PICK_PICKUP;
1236 continue; 1164 continue;
1237 } 1165 }
1238 1166
1239 /* wands/staves/rods/horns */ 1167 /* wands/staves/rods/horns */
1240 if (op->contr->mode & PU_MAGIC_DEVICE) 1168 if (op->contr->mode & PU_MAGIC_DEVICE)
1241 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 1169 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1242 { 1170 {
1243 pick_up (op, tmp); 1171 CHK_PICK_PICKUP;
1244 continue; 1172 continue;
1245 } 1173 }
1246 1174
1247 /* pick up all magical items */ 1175 /* pick up all magical items */
1248 if (op->contr->mode & PU_MAGICAL) 1176 if (op->contr->mode & PU_MAGICAL)
1249 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1177 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1250 { 1178 {
1251 pick_up (op, tmp); 1179 CHK_PICK_PICKUP;
1252 continue; 1180 continue;
1253 } 1181 }
1254 1182
1255 if (op->contr->mode & PU_VALUABLES) 1183 if (op->contr->mode & PU_VALUABLES)
1256 { 1184 {
1257 if (tmp->type == MONEY || tmp->type == GEM) 1185 if (tmp->type == MONEY || tmp->type == GEM)
1258 { 1186 {
1259 pick_up (op, tmp); 1187 CHK_PICK_PICKUP;
1260 continue; 1188 continue;
1261 } 1189 }
1262 } 1190 }
1263 1191
1264 /* rings & amulets - talismans seems to be typed AMULET */ 1192 /* rings & amulets - talismans seems to be typed AMULET */
1265 if (op->contr->mode & PU_JEWELS) 1193 if (op->contr->mode & PU_JEWELS)
1266 if (tmp->type == RING || tmp->type == AMULET) 1194 if (tmp->type == RING || tmp->type == AMULET)
1267 { 1195 {
1268 pick_up (op, tmp); 1196 CHK_PICK_PICKUP;
1269 continue; 1197 continue;
1270 } 1198 }
1271 1199
1272 /* we don't forget dragon food */ 1200 /* we don't forget dragon food */
1273 if (op->contr->mode & PU_FLESH) 1201 if (op->contr->mode & PU_FLESH)
1274 if (tmp->type == FLESH) 1202 if (tmp->type == FLESH)
1275 { 1203 {
1276 pick_up (op, tmp); 1204 CHK_PICK_PICKUP;
1277 continue; 1205 continue;
1278 } 1206 }
1279 1207
1280 /* bows and arrows. Bows are good for selling! */ 1208 /* bows and arrows. Bows are good for selling! */
1281 if (op->contr->mode & PU_BOW) 1209 if (op->contr->mode & PU_BOW)
1282 if (tmp->type == BOW) 1210 if (tmp->type == BOW)
1283 { 1211 {
1284 pick_up (op, tmp); 1212 CHK_PICK_PICKUP;
1285 continue; 1213 continue;
1286 } 1214 }
1287 1215
1288 if (op->contr->mode & PU_ARROW) 1216 if (op->contr->mode & PU_ARROW)
1289 if (tmp->type == ARROW) 1217 if (tmp->type == ARROW)
1290 { 1218 {
1291 pick_up (op, tmp); 1219 CHK_PICK_PICKUP;
1292 continue; 1220 continue;
1293 } 1221 }
1294 1222
1295 /* all kinds of armor etc. */ 1223 /* all kinds of armor etc. */
1296 if (op->contr->mode & PU_ARMOUR) 1224 if (op->contr->mode & PU_ARMOUR)
1297 if (tmp->type == ARMOUR) 1225 if (tmp->type == ARMOUR)
1298 { 1226 {
1299 pick_up (op, tmp); 1227 CHK_PICK_PICKUP;
1300 continue; 1228 continue;
1301 } 1229 }
1302 1230
1303 if (op->contr->mode & PU_HELMET) 1231 if (op->contr->mode & PU_HELMET)
1304 if (tmp->type == HELMET) 1232 if (tmp->type == HELMET)
1305 { 1233 {
1306 pick_up (op, tmp); 1234 CHK_PICK_PICKUP;
1307 continue; 1235 continue;
1308 } 1236 }
1309 1237
1310 if (op->contr->mode & PU_SHIELD) 1238 if (op->contr->mode & PU_SHIELD)
1311 if (tmp->type == SHIELD) 1239 if (tmp->type == SHIELD)
1312 { 1240 {
1313 pick_up (op, tmp); 1241 CHK_PICK_PICKUP;
1314 continue; 1242 continue;
1315 } 1243 }
1316 1244
1317 if (op->contr->mode & PU_BOOTS) 1245 if (op->contr->mode & PU_BOOTS)
1318 if (tmp->type == BOOTS) 1246 if (tmp->type == BOOTS)
1319 { 1247 {
1320 pick_up (op, tmp); 1248 CHK_PICK_PICKUP;
1321 continue; 1249 continue;
1322 } 1250 }
1323 1251
1324 if (op->contr->mode & PU_GLOVES) 1252 if (op->contr->mode & PU_GLOVES)
1325 if (tmp->type == GLOVES) 1253 if (tmp->type == GLOVES)
1326 { 1254 {
1327 pick_up (op, tmp); 1255 CHK_PICK_PICKUP;
1328 continue; 1256 continue;
1329 } 1257 }
1330 1258
1331 if (op->contr->mode & PU_CLOAK) 1259 if (op->contr->mode & PU_CLOAK)
1332 if (tmp->type == CLOAK) 1260 if (tmp->type == CLOAK)
1333 { 1261 {
1334 pick_up (op, tmp); 1262 CHK_PICK_PICKUP;
1335 continue; 1263 continue;
1336 } 1264 }
1337 1265
1338 /* hoping to catch throwing daggers here */ 1266 /* hoping to catch throwing daggers here */
1339 if (op->contr->mode & PU_MISSILEWEAPON) 1267 if (op->contr->mode & PU_MISSILEWEAPON)
1340 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN)) 1268 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1341 { 1269 {
1342 pick_up (op, tmp); 1270 CHK_PICK_PICKUP;
1343 continue; 1271 continue;
1344 } 1272 }
1345 1273
1346 /* careful: chairs and tables are weapons! */ 1274 /* careful: chairs and tables are weapons! */
1347 if (op->contr->mode & PU_ALLWEAPON) 1275 if (op->contr->mode & PU_ALLWEAPON)
1348 { 1276 {
1349 if (tmp->type == WEAPON && tmp->name != NULL) 1277 if (tmp->type == WEAPON && tmp->name != NULL)
1350 { 1278 {
1351 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL && 1279 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1352 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL) 1280 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1353 { 1281 {
1354 pick_up (op, tmp); 1282 CHK_PICK_PICKUP;
1355 continue; 1283 continue;
1356 } 1284 }
1357 } 1285 }
1358 1286
1359 if (tmp->type == WEAPON && tmp->name == NULL) 1287 if (tmp->type == WEAPON && tmp->name == NULL)
1360 { 1288 {
1361 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL) 1289 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1362 { 1290 {
1363 pick_up (op, tmp); 1291 CHK_PICK_PICKUP;
1364 continue; 1292 continue;
1365 } 1293 }
1366 } 1294 }
1367 } 1295 }
1368 1296
1369 /* misc stuff that's useful */ 1297 /* misc stuff that's useful */
1370 if (op->contr->mode & PU_KEY) 1298 if (op->contr->mode & PU_KEY)
1371 if (tmp->type == KEY || tmp->type == SPECIAL_KEY) 1299 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1372 { 1300 {
1373 pick_up (op, tmp); 1301 CHK_PICK_PICKUP;
1374 continue; 1302 continue;
1375 } 1303 }
1376 1304
1377 /* any of the last 4 bits set means we use the ratio for value 1305 /* any of the last 4 bits set means we use the ratio for value
1378 * pickups */ 1306 * pickups */
1379 if (op->contr->mode & PU_RATIO) 1307 if (op->contr->mode & PU_RATIO)
1380 { 1308 {
1381 /* use value density to decide what else to grab */ 1309 /* use value density to decide what else to grab */
1382 /* >=7 was >= op->contr->mode */ 1310 /* >=7 was >= op->contr->mode */
1383 /* >=7 is the old standard setting. Now we take the last 4 bits 1311 /* >=7 is the old standard setting. Now we take the last 4 bits
1384 * and multiply them by 5, giving 0..15*5== 5..75 */ 1312 */
1385 wvratio = (op->contr->mode & PU_RATIO) * 5; 1313 wvratio = op->contr->mode & PU_RATIO;
1386 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio) 1314 if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1387 { 1315 {
1388 pick_up (op, tmp); 1316 CHK_PICK_PICKUP;
1389#if 0 1317#if 0
1390 fprintf (stderr, "HIGH WEIGHT/VALUE ["); 1318 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1391 if (tmp->name != NULL) 1319 if (tmp->name != NULL)
1392 { 1320 {
1393 fprintf (stderr, "%s", tmp->name); 1321 fprintf (stderr, "%s", tmp->name);
1394 } 1322 }
1395 else 1323 else
1396 fprintf (stderr, "%s", tmp->arch->name); 1324 fprintf (stderr, "%s", tmp->arch->archname);
1397 fprintf (stderr, ",%d] = ", tmp->type); 1325 fprintf (stderr, ",%d] = ", tmp->type);
1398 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1326 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1399#endif 1327#endif
1400 continue; 1328 continue;
1401 } 1329 }
… …
1412 * found object is returned. 1340 * found object is returned.
1413 */ 1341 */
1414object * 1342object *
1415find_arrow (object *op, const char *type) 1343find_arrow (object *op, const char *type)
1416{ 1344{
1417 object *tmp = NULL;
1418
1419 for (op = op->inv; op; op = op->below) 1345 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1420 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1421 tmp = find_arrow (op, type);
1422 else if (op->type == ARROW && op->race == type) 1346 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1347 return splay (tmp);
1348
1349 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1350 if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
1351 if (object *arrow = find_arrow (tmp, type))
1352 {
1353 splay (tmp);
1423 return op; 1354 return arrow;
1355 }
1356
1424 return tmp; 1357 return 0;
1425} 1358}
1426 1359
1427/* 1360/*
1428 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1361 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1429 * against the target. A full test is not performed, simply a basic test 1362 * against the target. A full test is not performed, simply a basic test
1430 * of resistances. The archer is making a quick guess at what he sees down 1363 * of resistances. The archer is making a quick guess at what he sees down
1431 * the hall. Failing that it does it's best to pick the highest plus arrow. 1364 * the hall. Failing that it does it's best to pick the highest plus arrow.
1432 */ 1365 */
1433
1434object * 1366object *
1435find_better_arrow (object *op, object *target, const char *type, int *better) 1367find_better_arrow (object *op, object *target, const char *type, int *better)
1436{ 1368{
1437 object *tmp = NULL, *arrow, *ntmp; 1369 object *tmp = NULL, *arrow, *ntmp;
1438 int attacknum, attacktype, betterby = 0, i; 1370 int attacknum, attacktype, betterby = 0, i;
… …
1453 } 1385 }
1454 } 1386 }
1455 else if (arrow->type == ARROW && arrow->race == type) 1387 else if (arrow->type == ARROW && arrow->race == type)
1456 { 1388 {
1457 /* allways prefer assasination/slaying */ 1389 /* allways prefer assasination/slaying */
1458 if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race)) 1390 if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))
1459 { 1391 {
1460 if (arrow->attacktype & AT_DEATH) 1392 if (arrow->attacktype & AT_DEATH)
1461 { 1393 {
1462 *better = 100; 1394 *better = 100;
1463 return arrow; 1395 return arrow;
… …
1471 else 1403 else
1472 { 1404 {
1473 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) 1405 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1474 { 1406 {
1475 attacktype = 1 << attacknum; 1407 attacktype = 1 << attacknum;
1476 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) 1408 if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1477 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby) 1409 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1478 { 1410 {
1479 tmp = arrow; 1411 tmp = arrow;
1480 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100; 1412 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1481 } 1413 }
1482 } 1414 }
1483 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1415 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1484 { 1416 {
1485 tmp = arrow; 1417 tmp = arrow;
… …
1491 betterby = 1 + arrow->magic + arrow->stats.dam; 1423 betterby = 1 + arrow->magic + arrow->stats.dam;
1492 } 1424 }
1493 } 1425 }
1494 } 1426 }
1495 } 1427 }
1428
1496 if (tmp == NULL && arrow == NULL) 1429 if (tmp == NULL && arrow == NULL)
1497 return find_arrow (op, type); 1430 return find_arrow (op, type);
1498 1431
1499 *better = betterby; 1432 *better = betterby;
1500 return tmp; 1433 return tmp;
… …
1504 * find_better_arrow to find a decent arrow to use. 1437 * find_better_arrow to find a decent arrow to use.
1505 * op = the shooter 1438 * op = the shooter
1506 * type = bow->race 1439 * type = bow->race
1507 * dir = fire direction 1440 * dir = fire direction
1508 */ 1441 */
1509
1510object * 1442object *
1511pick_arrow_target (object *op, const char *type, int dir) 1443pick_arrow_target (object *op, const char *type, int dir)
1512{ 1444{
1513 object *tmp = NULL; 1445 object *tmp = NULL;
1514 maptile *m; 1446 maptile *m;
… …
1579 */ 1511 */
1580int 1512int
1581fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy) 1513fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1582{ 1514{
1583 object *left, *bow; 1515 object *left, *bow;
1584 int bowspeed, mflags; 1516 int mflags;
1585 maptile *m; 1517 maptile *m;
1586 1518
1587 if (!dir) 1519 if (!dir)
1588 { 1520 {
1589 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1521 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1590 return 0; 1522 return 0;
1591 } 1523 }
1592 1524
1593 if (op->type == PLAYER) 1525 if (op->contr)
1594 bow = op->contr->ranges[range_bow]; 1526 bow = op->current_weapon;
1595 else 1527 else
1596 { 1528 {
1597 for (bow = op->inv; bow; bow = bow->below) 1529 for (bow = op->inv; bow; bow = bow->below)
1598 /* Don't check for applied - monsters don't apply bows - in that way, they 1530 /* Don't check for applied - monsters don't apply bows - in that way, they
1599 * don't need to switch back and forth between bows and weapons. 1531 * don't need to switch back and forth between bows and weapons.
… …
1604 if (!bow) 1536 if (!bow)
1605 { 1537 {
1606 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1538 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1607 return 0; 1539 return 0;
1608 } 1540 }
1541
1542 // optimisation: move object to top so we will find it quickly again
1543 if (bow->below)
1544 {
1545 bow->remove ();
1546 op->insert (bow);
1547 }
1548
1609 } 1549 }
1610 1550
1611 if (!bow->race || !bow->skill) 1551 if (!bow->race || !bow->skill)
1612 { 1552 {
1613 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1553 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1614 return 0; 1554 return 0;
1615 } 1555 }
1616
1617 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1618
1619 /* penalize ROF for bestarrow */
1620 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1621 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1622
1623 if (bowspeed < 1)
1624 bowspeed = 1;
1625 1556
1626 if (arrow == NULL) 1557 if (arrow == NULL)
1627 { 1558 {
1628 if ((arrow = find_arrow (op, bow->race)) == NULL) 1559 if ((arrow = find_arrow (op, bow->race)) == NULL)
1629 { 1560 {
1630 if (op->type == PLAYER) 1561 if (op->type == PLAYER)
1631 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1562 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1632 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1563 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1633 else 1564 else
1634 CLEAR_FLAG (op, FLAG_READY_BOW); 1565 CLEAR_FLAG (op, FLAG_READY_BOW);
1566
1635 return 0; 1567 return 0;
1636 } 1568 }
1637 } 1569 }
1638 1570
1639 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1571 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
… …
1652 arrow->destroy (); 1584 arrow->destroy ();
1653 return 0; 1585 return 0;
1654 } 1586 }
1655 1587
1656 left = arrow; /* these are arrows left to the player */ 1588 left = arrow; /* these are arrows left to the player */
1657 arrow = get_split_ob (arrow, 1); 1589 arrow = arrow->split ();
1658 if (!arrow) 1590 if (!arrow)
1659 { 1591 {
1660 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1592 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1661 return 0; 1593 return 0;
1662 } 1594 }
1663 1595
1664 arrow->set_owner (op); 1596 arrow->set_owner (op);
1665 arrow->skill = bow->skill; 1597 arrow->skill = bow->skill;
1666
1667 arrow->direction = dir; 1598 arrow->direction = dir;
1668 arrow->x = sx; 1599
1669 arrow->y = sy; 1600 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1601 arrow->stats.hp = arrow->stats.dam;
1602 arrow->stats.grace = arrow->attacktype;
1603
1604 if (arrow->slaying)
1605 arrow->spellarg = strdup (arrow->slaying);
1606
1607#if 0
1608 if (player *pl = op->contr)
1609 {
1610 float speed = pl->weapon_sp;
1611
1612 /* penalize ROF for bestarrow */
1613 if (pl->bowtype == bow_bestarrow)
1614 speed *= .9f;
1615 else
1616 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1617
1618 op->speed_left += speed - op->speed;
1619 }
1620#endif
1621
1622 SET_ANIMATION (arrow, arrow->direction);
1623
1624 /* update the speed */
1625 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1626 + bow->stats.dam / 7.f;
1627
1628 arrow->set_speed (max (arrow->speed, 2.f));
1629 arrow->speed_left = 0;
1630
1631 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1670 1632
1671 if (op->type == PLAYER) 1633 if (op->type == PLAYER)
1672 { 1634 {
1673 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1674 op->update_stats ();
1675 }
1676
1677 SET_ANIMATION (arrow, arrow->direction);
1678 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1679 arrow->stats.hp = arrow->stats.dam;
1680 arrow->stats.grace = arrow->attacktype;
1681 if (arrow->slaying != NULL)
1682 arrow->spellarg = strdup (arrow->slaying);
1683
1684 /* Note that this was different for monsters - they got their level
1685 * added to the damage. I think the strength bonus is more proper.
1686 */
1687
1688 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1689
1690 /* update the speed */
1691 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1692 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1693
1694 if (arrow->speed < 1.0)
1695 arrow->speed = 1.0;
1696 update_ob_speed (arrow);
1697 arrow->speed_left = 0;
1698
1699 if (op->type == PLAYER)
1700 {
1701 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1702 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1703 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1704
1705 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1635 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1636 wc -= dex_bonus[op->stats.Dex];
1637
1638 if (!arrow->slaying)
1639 arrow->slaying = op->slaying;
1640
1641 arrow->attacktype |= op->attacktype;
1706 } 1642 }
1707 else 1643 else
1708 { 1644 {
1709 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1710 arrow->level = op->level; 1645 arrow->level = op->level;
1711 } 1646 arrow->stats.wc -= bow->magic;
1712 1647
1713 if (arrow->attacktype == AT_PHYSICAL) 1648 if (!arrow->slaying)
1649 arrow->slaying = bow->slaying;
1650
1714 arrow->attacktype |= bow->attacktype; 1651 arrow->attacktype |= bow->attacktype;
1652 }
1715 1653
1716 if (bow->slaying) 1654 wc -= arrow->level;
1717 arrow->slaying = bow->slaying; 1655 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1718 1656
1719 arrow->map = m; 1657 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1720 arrow->move_type = MOVE_FLY_LOW; 1658 arrow->move_type = MOVE_FLY_LOW;
1721 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1659 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1722 1660
1723 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1661 op->play_sound (sound_find ("fire_arrow"));
1724 insert_ob_in_map (arrow, m, op, 0); 1662 m->insert (arrow, sx, sy, op);
1725 1663
1726 if (!arrow->destroyed ()) 1664 if (!arrow->destroyed ())
1727 move_arrow (arrow); 1665 move_arrow (arrow);
1728
1729 if (op->type == PLAYER)
1730 {
1731 if (left->destroyed ())
1732 esrv_del_item (op->contr, left->count);
1733 else
1734 esrv_send_item (op, left);
1735 }
1736 1666
1737 return 1; 1667 return 1;
1738} 1668}
1739 1669
1740/* Special fire code for players - this takes into 1670/* Special fire code for players - this takes into
… …
1749{ 1679{
1750 int ret = 0, wcmod = 0; 1680 int ret = 0, wcmod = 0;
1751 1681
1752 if (op->contr->bowtype == bow_bestarrow) 1682 if (op->contr->bowtype == bow_bestarrow)
1753 { 1683 {
1754 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1684 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1755 } 1685 }
1756 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1686 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1757 { 1687 {
1758 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1688 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1759 wcmod = -1; 1689 wcmod = -1;
1690
1760 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); 1691 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1761 } 1692 }
1762 else if (op->contr->bowtype == bow_threewide) 1693 else if (op->contr->bowtype == bow_threewide)
1763 { 1694 {
1764 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1695 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
… …
1768 else if (op->contr->bowtype == bow_spreadshot) 1699 else if (op->contr->bowtype == bow_spreadshot)
1769 { 1700 {
1770 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1701 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1771 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1702 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1772 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1703 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1773
1774 } 1704 }
1775 else 1705 else
1776 { 1706 {
1777 /* Simple case */ 1707 /* Simple case */
1778 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1708 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1779 } 1709 }
1710
1780 return ret; 1711 return ret;
1781} 1712}
1782
1783 1713
1784/* Fires a misc (wand/rod/horn) object in 'dir'. 1714/* Fires a misc (wand/rod/horn) object in 'dir'.
1785 * Broken apart from 'fire' to keep it more readable. 1715 * Broken apart from 'fire' to keep it more readable.
1786 */ 1716 */
1787void 1717void
1788fire_misc_object (object *op, int dir) 1718fire_misc_object (object *op, int dir)
1789{ 1719{
1790 object *item; 1720 object *item = op->contr->ranged_ob;
1791 1721
1792 if (!op->contr->ranges[range_misc]) 1722 if (!item)
1793 { 1723 {
1794 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); 1724 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1795 return; 1725 return;
1796 } 1726 }
1797 1727
1798 item = op->contr->ranges[range_misc];
1799 if (!item->inv) 1728 if (!item->inv)
1800 { 1729 {
1801 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1730 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1802 return; 1731 return;
1803 } 1732 }
1733
1734 if (!op->change_weapon (item))
1735 return;
1736
1804 if (item->type == WAND) 1737 if (item->type == WAND)
1805 { 1738 {
1806 if (item->stats.food <= 0) 1739 if (item->stats.food <= 0)
1807 { 1740 {
1808 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1741 op->contr->play_sound (sound_find ("wand_poof"));
1809 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1742 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1743
1810 return; 1744 return;
1811 } 1745 }
1812 } 1746 }
1813 else if (item->type == ROD || item->type == HORN) 1747 else if (item->type == ROD || item->type == HORN)
1814 { 1748 {
1815 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1749 sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
1750
1751 // using the maximum of the rods charge allows at least one spell cast
1752 // for a rod or horn, this fixes some broken rods.
1753 if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
1816 { 1754 {
1817 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1755 op->contr->play_sound (sound_find ("wand_poof"));
1756
1818 if (item->type == ROD) 1757 if (item->type == ROD)
1819 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1758 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1820 else 1759 else
1821 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1760 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1761
1822 return; 1762 return;
1823 } 1763 }
1824 } 1764 }
1825 1765
1826 if (cast_spell (op, item, dir, item->inv, NULL)) 1766 if (cast_spell (op, item, dir, item->inv, NULL))
… …
1833 object *tmp; 1773 object *tmp;
1834 1774
1835 if (item->arch) 1775 if (item->arch)
1836 { 1776 {
1837 CLEAR_FLAG (item, FLAG_ANIMATE); 1777 CLEAR_FLAG (item, FLAG_ANIMATE);
1838 item->face = item->arch->clone.face; 1778 item->face = item->arch->face;
1839 item->speed = 0; 1779 item->set_speed (0);
1840 update_ob_speed (item);
1841 } 1780 }
1842 if ((tmp = item->in_player ())) 1781
1782 if (object *pl = item->visible_to ())
1843 esrv_update_item (UPD_ANIM, tmp, item); 1783 esrv_update_item (UPD_ANIM, pl, item);
1844 } 1784 }
1845 } 1785 }
1846 else if (item->type == ROD || item->type == HORN) 1786 else if (item->type == ROD || item->type == HORN)
1847 {
1848 drain_rod_charge (item); 1787 drain_rod_charge (item);
1849 }
1850 } 1788 }
1851} 1789}
1852 1790
1853/* Received a fire command for the player - go and do it. 1791/* Received a fire command for the player - go and do it.
1854 */ 1792 */
1855void 1793bool
1856fire (object *op, int dir) 1794fire (object *op, int dir)
1857{ 1795{
1858 int spellcost = 0; 1796 int spellcost = 0;
1859 1797
1860 /* check for loss of invisiblity/hide */ 1798 /* check for loss of invisiblity/hide */
1861 if (action_makes_visible (op)) 1799 if (action_makes_visible (op))
1862 make_visible (op); 1800 make_visible (op);
1863 1801
1864 switch (op->contr->shoottype) 1802 player *pl = op->contr;
1803
1804 if (pl->golem)
1805 {
1806 control_golem (op->contr->golem, dir);
1807 return false;
1865 { 1808 }
1866 case range_none:
1867 return;
1868 1809
1869 case range_bow: 1810 object *ob = pl->ranged_ob;
1811
1812 if (!ob)
1813 return false;
1814
1815 if (!op->change_weapon (ob))
1816 return false;
1817
1818 if (op->speed_left > 0.f)
1819 --op->speed_left;
1820 else
1821 return false;
1822
1823 switch (ob->type)
1824 {
1825 case BOW:
1870 player_fire_bow (op, dir); 1826 player_fire_bow (op, dir);
1871 return; 1827 break;
1872 1828
1873 case range_magic: /* Casting spells */ 1829 case SPELL:
1874 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1830 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1875 return; 1831 break;
1876 1832
1877 case range_misc: 1833 case BUILDER:
1834 apply_map_builder (op, dir);
1835 break;
1836
1837 case SKILL:
1838 do_skill (op, op, ob, dir, 0);
1839 break;
1840
1841 default:
1878 fire_misc_object (op, dir); 1842 fire_misc_object (op, dir);
1879 return; 1843 break;
1880
1881 case range_golem: /* Control summoned monsters from scrolls */
1882 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1883 {
1884 op->contr->ranges[range_golem] = 0;
1885 op->contr->shoottype = range_none;
1886 }
1887 else
1888 control_golem (op->contr->ranges[range_golem], dir);
1889 return;
1890
1891 case range_skill:
1892 if (!op->chosen_skill)
1893 {
1894 if (op->type == PLAYER)
1895 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1896 return;
1897 }
1898 (void) do_skill (op, op, op->chosen_skill, dir, NULL);
1899 return;
1900 case range_builder:
1901 apply_map_builder (op, dir);
1902 return;
1903 default:
1904 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1905 return;
1906 } 1844 }
1907}
1908 1845
1909 1846 return true;
1847}
1910 1848
1911/* find_key 1849/* find_key
1912 * We try to find a key for the door as passed. If we find a key 1850 * We try to find a key for the door as passed. If we find a key
1913 * and successfully use it, we return the key, otherwise NULL 1851 * and successfully use it, we return the key, otherwise NULL
1914 * This function merges both normal and locked door, since the logic 1852 * This function merges both normal and locked door, since the logic
… …
1916 * pl is the player, 1854 * pl is the player,
1917 * inv is the objects inventory to searched 1855 * inv is the objects inventory to searched
1918 * door is the door we are trying to match against. 1856 * door is the door we are trying to match against.
1919 * This function can be called recursively to search containers. 1857 * This function can be called recursively to search containers.
1920 */ 1858 */
1921
1922object * 1859object *
1923find_key (object *pl, object *container, object *door) 1860find_key (object *pl, object *container, object *door)
1924{ 1861{
1925 object *tmp, *key; 1862 object *tmp, *key;
1926 1863
1927 /* Should not happen, but sanity checking is never bad */ 1864 /* Should not happen, but sanity checking is never bad */
1928 if (container->inv == NULL) 1865 if (!container->inv)
1929 return NULL; 1866 return 0;
1930 1867
1931 /* First, lets try to find a key in the top level inventory */ 1868 /* First, lets try to find a key in the top level inventory */
1932 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1869 for (tmp = container->inv; tmp; tmp = tmp->below)
1933 { 1870 {
1934 if (door->type == DOOR && tmp->type == KEY) 1871 if (door->type == DOOR && tmp->type == KEY)
1935 break; 1872 break;
1936 /* For sanity, we should really check door type, but other stuff 1873 /* For sanity, we should really check door type, but other stuff
1937 * (like containers) can be locked with special keys 1874 * (like containers) can be locked with special keys
1938 */ 1875 */
1939 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1876 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1940 break; 1877 break;
1941 } 1878 }
1879
1942 /* No key found - lets search inventories now */ 1880 /* No key found - lets search inventories now */
1943 /* If we find and use a key in an inventory, return at that time. 1881 /* If we find and use a key in an inventory, return at that time.
1944 * otherwise, if we search all the inventories and still don't find 1882 * otherwise, if we search all the inventories and still don't find
1945 * a key, return 1883 * a key, return
1946 */ 1884 */
1947 if (!tmp) 1885 if (!tmp)
1948 { 1886 {
1949 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1887 for (tmp = container->inv; tmp; tmp = tmp->below)
1950 { 1888 {
1951 /* No reason to search empty containers */ 1889 /* No reason to search empty containers */
1952 if (tmp->type == CONTAINER && tmp->inv) 1890 if (tmp->type == CONTAINER && tmp->inv)
1953 { 1891 {
1954 if ((key = find_key (pl, tmp, door)) != NULL) 1892 if ((key = find_key (pl, tmp, door)))
1955 return key; 1893 return key;
1956 } 1894 }
1957 } 1895 }
1896
1958 if (!tmp) 1897 if (!tmp)
1959 return NULL; 1898 return NULL;
1960 } 1899 }
1900
1961 /* We get down here if we have found a key. Now if its in a container, 1901 /* We get down here if we have found a key. Now if its in a container,
1962 * see if we actually want to use it 1902 * see if we actually want to use it
1963 */ 1903 */
1964 if (pl != container) 1904 if (pl != container)
1965 { 1905 {
… …
1986 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1926 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1987 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1927 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1988 return NULL; 1928 return NULL;
1989 } 1929 }
1990 } 1930 }
1931
1991 return tmp; 1932 return tmp;
1992} 1933}
1993 1934
1994/* moved door processing out of move_player_attack. 1935/* moved door processing out of move_player_attack.
1995 * returns 1 if player has opened the door with a key 1936 * returns 1 if player has opened the door with a key
… …
1997 * 0 otherwise 1938 * 0 otherwise
1998 */ 1939 */
1999static int 1940static int
2000player_attack_door (object *op, object *door) 1941player_attack_door (object *op, object *door)
2001{ 1942{
2002 /* If its a door, try to find a use a key. If we do destroy the door, 1943 /* If its a door, try to find a key. If we do destroy the door,
2003 * might as well return immediately as there is nothing more to do - 1944 * might as well return immediately as there is nothing more to do -
2004 * otherwise, we fall through to the rest of the code. 1945 * otherwise, we fall through to the rest of the code.
2005 */ 1946 */
2006 object *key = find_key (op, op, door); 1947 object *key = find_key (op, op, door);
2007 1948
2008 /* IF we found a key, do some extra work */ 1949 /* If we found a key, do some extra work */
2009 if (key) 1950 if (key)
2010 { 1951 {
2011 object *container = key->env; 1952 object *container = key->env;
2012 1953
2013 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
2014 if (action_makes_visible (op)) 1954 if (action_makes_visible (op))
2015 make_visible (op); 1955 make_visible (op);
1956
2016 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1957 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2017 spring_trap (door->inv, op); 1958 spring_trap (door->inv, op);
1959
2018 if (door->type == DOOR) 1960 if (door->type == DOOR)
2019 {
2020 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1961 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2021 }
2022 else if (door->type == LOCKED_DOOR) 1962 else if (door->type == LOCKED_DOOR)
2023 { 1963 {
2024 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1964 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
2025 remove_door2 (door); /* remove door without violence ;-) */ 1965 remove_door2 (door); /* remove door without violence ;-) */
2026 } 1966 }
1967
2027 /* Do this after we print the message */ 1968 /* Do this after we print the message */
2028 decrease_ob (key); /* Use up one of the keys */ 1969 key->decrease (); /* Use up one of the keys */
2029 /* Need to update the weight the container the key was in */ 1970
2030 if (container != op)
2031 esrv_update_item (UPD_WEIGHT, op, container);
2032 return 1; /* Nothing more to do below */ 1971 return 1; /* Nothing more to do below */
2033 } 1972 }
2034 else if (door->type == LOCKED_DOOR) 1973 else if (door->type == LOCKED_DOOR)
2035 { 1974 {
2036 /* Might as well return now - no other way to open this */ 1975 /* Might as well return now - no other way to open this */
2037 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1976 op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2038 return 1; 1977 return 1;
2039 } 1978 }
1979
2040 return 0; 1980 return 0;
2041} 1981}
2042 1982
2043/* This function is just part of a breakup from move_player. 1983/* This function is just part of a breakup from move_player.
2044 * It should keep the code cleaner. 1984 * It should keep the code cleaner.
2045 * When this is called, the players direction has been updated 1985 * When this is called, the players direction has been updated
2046 * (taking into account confusion.) The player is also actually 1986 * (taking into account confusion.) The player is also actually
2047 * going to try and move (not fire weapons). 1987 * going to try and move (not fire weapons).
2048 */ 1988 */
2049void 1989bool
2050move_player_attack (object *op, int dir) 1990move_player_attack (object *op, int dir)
2051{ 1991{
2052 object *tmp, *mon;
2053 sint16 nx, ny;
2054 int on_battleground; 1992 int on_battleground;
2055 maptile *m;
2056 1993
2057 nx = freearr_x[dir] + op->x; 1994 sint16 nx = freearr_x[dir] + op->x;
2058 ny = freearr_y[dir] + op->y; 1995 sint16 ny = freearr_y[dir] + op->y;
2059 1996
2060 on_battleground = op_on_battleground (op, 0, 0); 1997 on_battleground = op_on_battleground (op, 0, 0);
1998
1999 if (out_of_map (op->map, nx, ny))
2000 return false;
2001
2002 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2003 {
2004 --op->speed_left;
2005 return true;
2006 }
2061 2007
2062 /* If braced, or can't move to the square, and it is not out of the 2008 /* If braced, or can't move to the square, and it is not out of the
2063 * map, attack it. Note order of if statement is important - don't 2009 * map, attack it. Note order of if statement is important - don't
2064 * want to be calling move_ob if braced, because move_ob will move the 2010 * want to be calling move_ob if braced, because move_ob will move the
2065 * player. This is a pretty nasty hack, because if we could 2011 * player. This is a pretty nasty hack, because if we could
2066 * move to some space, it then means that if we are braced, we should 2012 * move to some space, it then means that if we are braced, we should
2067 * do nothing at all. As it is, if we are braced, we go through 2013 * do nothing at all. As it is, if we are braced, we go through
2068 * quite a bit of processing. However, it probably is less than what 2014 * quite a bit of processing. However, it probably is less than what
2069 * move_ob uses. 2015 * move_ob uses.
2070 */ 2016 */
2071 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny)) 2017 maptile *m = op->map->xy_find (nx, ny);
2072 {
2073 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2074 {
2075 m = get_map_from_coord (op->map, &nx, &ny);
2076 if (!m)
2077 return; /* Don't think this should happen */
2078 }
2079 else
2080 m = op->map;
2081 2018
2082 if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)
2083 {
2084 /* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2085 return;
2086 }
2087
2088 mon = 0;
2089 /* Go through all the objects, and find ones of interest. Only stop if 2019 /* Go through all the objects, and find ones of interest. Only stop if
2090 * we find a monster - that is something we know we want to attack. 2020 * we find a monster - that is something we know we want to attack.
2091 * if its a door or barrel (can roll) see if there may be monsters 2021 * if its a door or barrel (can roll) see if there may be monsters
2092 * on the space 2022 * on the space
2093 */ 2023 */
2094 while (tmp) 2024 object *mon;
2095 { 2025 for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2096 if (tmp == op) 2026 {
2097 { 2027 if ((mon->flag [FLAG_ALIVE]
2098 tmp = tmp->above; 2028 || mon->type == LOCKED_DOOR
2099 continue; 2029 || mon->flag [FLAG_CAN_ROLL])
2100 }
2101
2102 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2103 {
2104 mon = tmp; 2030 && mon != op)
2105 break; 2031 break;
2106 } 2032 }
2107 2033
2108 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2109 mon = tmp;
2110
2111 tmp = tmp->above;
2112 }
2113
2114 if (!mon) /* This happens anytime the player tries to move */ 2034 if (!mon) /* This happens anytime the player tries to move */
2115 return; /* into a wall */ 2035 return false; /* into a wall */
2116 2036
2117 if (mon->head)
2118 mon = mon->head; 2037 mon = mon->head_ ();
2119 2038
2120 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 2039 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2040 if (op->contr->weapon_sp_left > 0.f)
2121 if (player_attack_door (op, mon)) 2041 if (player_attack_door (op, mon))
2042 {
2043 --op->contr->weapon_sp_left;
2122 return; 2044 return true;
2045 }
2123 2046
2124 /* The following deals with possibly attacking peaceful 2047 /* The following deals with possibly attacking peaceful
2125 * or frienddly creatures. Basically, all players are considered 2048 * or friendly creatures. Basically, all players are considered
2126 * unaggressive. If the moving player has peaceful set, then the 2049 * unaggressive. If the moving player has peaceful set, then the
2127 * object should be pushed instead of attacked. It is assumed that 2050 * object should be pushed instead of attacked. It is assumed that
2128 * if you are braced, you will not attack friends accidently, 2051 * if you are braced, you will not attack friends accidently,
2129 * and thus will not push them. 2052 * and thus will not push them.
2130 */ 2053 */
2131 2054
2132 /* If the creature is a pet, push it even if the player is not 2055 /* If the creature is a pet, push it even if the player is not
2133 * peaceful. Our assumption is the creature is a pet if the 2056 * peaceful. Our assumption is the creature is a pet if the
2134 * player owns it and it is either friendly or unagressive. 2057 * player owns it and it is either friendly or unagressive.
2135 */ 2058 */
2136 if ((op->type == PLAYER) 2059 if (op->type == PLAYER
2137#if COZY_SERVER
2138 &&
2139 ((mon->owner && mon->owner->contr 2060 && ((mon->owner && mon->owner->contr
2140 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op) 2061 && same_party (mon->owner->contr->party, op->contr->party))
2141#else
2142 && mon->owner == op 2062 || mon->owner == op)
2143#endif
2144 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2063 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2145 { 2064 {
2146 /* If we're braced, we don't want to switch places with it */ 2065 /* If we're braced, we don't want to switch places with it */
2147 if (op->contr->braced) 2066 if (op->contr->braced)
2148 return; 2067 return false;
2149 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2068
2069 if (op->speed_left > 0.f)
2070 {
2071 --op->speed_left;
2072
2073 op->play_sound (sound_find ("push_player"));
2150 (void) push_ob (mon, dir, op); 2074 push_ob (mon, dir, op);
2075
2151 if (op->contr->tmp_invis || op->hide) 2076 if (op->contr->tmp_invis || op->hide)
2152 make_visible (op); 2077 make_visible (op);
2078
2153 return; 2079 return true;
2154 } 2080 }
2081 else
2082 return false;
2083 }
2155 2084
2156 /* in certain circumstances, you shouldn't attack friendly 2085 /* in certain circumstances, you shouldn't attack friendly
2157 * creatures. Note that if you are braced, you can't push 2086 * creatures. Note that if you are braced, you can't push
2158 * someone, but put it inside this loop so that you won't 2087 * someone, but put it inside this loop so that you won't
2159 * attack them either. 2088 * attack them either.
2160 */ 2089 */
2161 if ((mon->type == PLAYER || mon->enemy != op) && 2090 if ((mon->type == PLAYER || mon->enemy != op)
2162 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2091 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2163#ifdef PROHIBIT_PLAYERKILL
2164 (op->contr->peaceful 2092 && ((op->contr->peaceful
2165 || (mon->type == PLAYER 2093 || (mon->type == PLAYER && mon->contr->peaceful))
2166 && mon->contr->
2167 peaceful)) &&
2168#else
2169 op->contr->peaceful &&
2170#endif
2171 !on_battleground)) 2094 && !on_battleground))
2095 {
2096 if (op->speed_left > 0.f)
2172 { 2097 {
2098 --op->speed_left;
2099
2173 if (!op->contr->braced) 2100 if (!op->contr->braced)
2174 { 2101 {
2175 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2102 op->play_sound (sound_find ("push_player"));
2176 (void) push_ob (mon, dir, op); 2103 push_ob (mon, dir, op);
2177 } 2104 }
2178 else 2105 else
2179 new_draw_info (0, 0, op, "You withhold your attack"); 2106 op->statusmsg ("You withhold your attack");
2180 2107
2181 if (op->contr->tmp_invis || op->hide) 2108 if (op->contr->tmp_invis || op->hide)
2182 make_visible (op); 2109 make_visible (op);
2183 }
2184 2110
2111 return true;
2112 }
2113 }
2185 /* If the object is a boulder or other rollable object, then 2114 /* If the object is a boulder or other rollable object, then
2186 * roll it if not braced. You can't roll it if you are braced. 2115 * roll it if not braced. You can't roll it if you are braced.
2187 */ 2116 */
2188 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 2117 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
2118 {
2119 if (op->speed_left > 0.f)
2189 { 2120 {
2121 --op->speed_left;
2122
2190 recursive_roll (mon, dir, op); 2123 recursive_roll (mon, dir, op);
2191 if (action_makes_visible (op)) 2124 if (action_makes_visible (op))
2192 make_visible (op); 2125 make_visible (op);
2193 }
2194 2126
2127 return true;
2128 }
2129 }
2195 /* Any generic living creature. Including things like doors. 2130 /* Any generic living creature. Including things like doors.
2196 * Way it works is like this: First, it must have some hit points 2131 * Way it works is like this: First, it must have some hit points
2197 * and be living. Then, it must be one of the following: 2132 * and be living. Then, it must be one of the following:
2198 * 1) Not a player, 2) A player, but of a different party. Note 2133 * 1) Not a player, 2) A player, but of a different party. Note
2199 * that party_number -1 is no party, so attacks can still happen. 2134 * that party_number -1 is no party, so attacks can still happen.
2200 */ 2135 */
2201
2202 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2136 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2203 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2137 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2204 { 2138 {
2205 2139 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2206 /* If the player hasn't hit something this tick, and does
2207 * so, give them speed boost based on weapon speed. Doing
2208 * it here is better than process_players2, which basically
2209 * incurred a 1 tick offset.
2210 */
2211 if (!op->contr->has_hit)
2212 { 2140 {
2213 op->speed_left += op->speed / op->contr->weapon_sp; 2141 --op->contr->weapon_sp_left;
2214
2215 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2216 }
2217 2142
2218 skill_attack (mon, op, 0, 0, 0); 2143 skill_attack (mon, op, 0, 0, 0);
2219
2220 /* If attacking another player, that player gets automatic
2221 * hitback, and doesn't loose luck either.
2222 * Disable hitback on the battleground or if the target is
2223 * the wiz.
2224 */
2225 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2226 {
2227 short luck = mon->stats.luck;
2228
2229 mon->contr->has_hit = 1;
2230 skill_attack (op, mon, 0, 0, 0);
2231 mon->stats.luck = luck;
2232 }
2233 2144
2234 if (action_makes_visible (op)) 2145 if (action_makes_visible (op))
2235 make_visible (op); 2146 make_visible (op);
2236 }
2237 } /* if player should attack something */
2238}
2239 2147
2240int 2148 return true;
2149 }
2150 }
2151
2152 return false;
2153}
2154
2155bool
2241move_player (object *op, int dir) 2156move_player (object *op, int dir)
2242{ 2157{
2243 int pick; 2158 int pick;
2244 2159
2245 if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY) 2160 if (!op->map || op->map->in_memory != MAP_ACTIVE)
2246 return 0; 2161 return 0;
2247 2162
2248 /* Sanity check: make sure dir is valid */ 2163 /* Sanity check: make sure dir is valid */
2249 if ((dir < 0) || (dir >= 9)) 2164 if ((dir < 0) || (dir >= 9))
2250 { 2165 {
2251 LOG (llevError, "move_player: invalid direction %d\n", dir); 2166 LOG (llevError, "move_player: invalid direction %d\n", dir);
2252 return 0; 2167 return 0;
2253 } 2168 }
2254 2169
2255 /* peterm: added following line */ 2170 /* peterm: added following line */
2256 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2171 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2257 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2172 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2258 2173
2259 op->facing = dir; 2174 op->facing = dir;
2260 2175
2261 if (op->hide) 2176 if (op->hide)
2262 do_hidden_move (op); 2177 do_hidden_move (op);
2263 2178
2179 bool retval;
2180
2264 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2181 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2265 /*nop */ ; 2182 retval = RESULT_INT (0);
2266 else if (op->contr->fire_on) 2183 else if (op->contr->fire_on)
2267 fire (op, dir); 2184 retval = fire (op, dir);
2268 else 2185 else
2269 { 2186 {
2270 move_player_attack (op, dir); 2187 retval = move_player_attack (op, dir);
2271 pick = check_pick (op); 2188 pick = check_pick (op);
2272 } 2189 }
2273 2190
2274 /* Add special check for newcs players and fire on - this way, the 2191 /* Add special check for newcs players and fire on - this way, the
2275 * server can handle repeat firing. 2192 * server can handle repeat firing.
… …
2282 /* Update how the player looks. Use the facing, so direction may 2199 /* Update how the player looks. Use the facing, so direction may
2283 * get reset to zero. This allows for full animation capabilities 2200 * get reset to zero. This allows for full animation capabilities
2284 * for players. 2201 * for players.
2285 */ 2202 */
2286 animate_object (op, op->facing); 2203 animate_object (op, op->facing);
2287 return 0; 2204
2205 return retval;
2288} 2206}
2289 2207
2290/* This is similar to handle_player, below, but is only used by the 2208/* This is similar to handle_player, below, but is only used by the
2291 * new client/server stuff. 2209 * new client/server stuff.
2292 * This is sort of special, in that the new client/server actually uses 2210 * This is sort of special, in that the new client/server actually uses
2293 * the new speed values for commands. 2211 * the new speed values for commands.
2294 * 2212 *
2295 * Returns true if there are more actions we can do. 2213 * Returns true if there are more actions we can do. Should not do
2214 * many actions in a row, as that would be too unfair to other
2215 * players.
2296 */ 2216 */
2297int 2217bool
2298handle_newcs_player (object *op) 2218handle_newcs_player (object *op)
2299{ 2219{
2300 if (op->contr->hidden)
2301 {
2302 op->invisible = 1000;
2303 /* the socket code flashes the player visible/invisible
2304 * depending on the value of invisible, so we need to
2305 * alternate it here for it to work correctly.
2306 */
2307 if (pticks & 2)
2308 op->invisible--;
2309 }
2310 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2311 {
2312 op->invisible--;
2313 if (!op->invisible)
2314 {
2315 make_visible (op);
2316 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2317 }
2318 }
2319
2320 if (QUERY_FLAG (op, FLAG_SCARED)) 2220 if (QUERY_FLAG (op, FLAG_SCARED))
2321 { 2221 {
2322 flee_player (op); 2222 if (op->speed_left > 0.f)
2323 /* If player is still scared, that is his action for this tick */
2324 if (QUERY_FLAG (op, FLAG_SCARED))
2325 { 2223 {
2326 op->speed_left--; 2224 --op->speed_left;
2225 flee_player (op);
2226
2327 return 0; 2227 return true;
2328 } 2228 }
2229 else
2230 return false;
2329 } 2231 }
2330
2331 /* I've been seeing crashes where the golem has been destroyed, but
2332 * the player object still points to the defunct golem. The code that
2333 * destroys the golem looks correct, and it doesn't always happen, so
2334 * put this in a a workaround to clean up the golem pointer.
2335 */
2336 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2337 op->contr->ranges[range_golem] = 0;
2338 2232
2339 /* call this here - we also will call this in do_ericserver, but 2233 /* call this here - we also will call this in do_ericserver, but
2340 * the players time has been increased when doericserver has been 2234 * the players time has been increased when doericserver has been
2341 * called, so we recheck it here. 2235 * called, so we recheck it here.
2342 */ 2236 */
2343 //TODO: better than handling 8 commands, use some more intelligent rate-limiting 2237 if (op->contr->ns->handle_command ())
2344 for (int rep = 8; --rep && op->contr->ns->handle_command (); )
2345 ;
2346
2347 if (op->speed_left < 0)
2348 return 0; 2238 return true;
2349 2239
2350 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2240 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2351 {
2352 /* All move commands take 1 tick, at least for now */
2353 op->speed_left--;
2354
2355 /* Instead of all the stuff below, let move_player take care
2356 * of it. Also, some of the skill stuff is only put in
2357 * there, as well as the confusion stuff.
2358 */
2359 move_player (op, op->direction); 2241 return move_player (op, op->direction);
2360 if (op->speed_left > 0)
2361 return 1;
2362 else
2363 return 0;
2364 }
2365 2242
2366 return 0; 2243 return false;
2367} 2244}
2368 2245
2369int 2246int
2370save_life (object *op) 2247save_life (object *op)
2371{ 2248{
… …
2373 return 0; 2250 return 0;
2374 2251
2375 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2252 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2376 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2253 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2377 { 2254 {
2378 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2255 op->play_sound (sound_find ("ob_evaporate"));
2379 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2256 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2380
2381 if (op->contr)
2382 esrv_del_item (op->contr, tmp->count);
2383 2257
2384 tmp->destroy (); 2258 tmp->destroy ();
2385 CLEAR_FLAG (op, FLAG_LIFESAVE); 2259 CLEAR_FLAG (op, FLAG_LIFESAVE);
2386 2260
2387 if (op->stats.hp < 0) 2261 if (op->stats.hp < 0)
… …
2400 return 0; 2274 return 0;
2401} 2275}
2402 2276
2403/* This goes throws the inventory and removes unpaid objects, and puts them 2277/* This goes throws the inventory and removes unpaid objects, and puts them
2404 * back in the map (location and map determined by values of env). This 2278 * back in the map (location and map determined by values of env). This
2405 * function will descend into containers. op is the object to start the search 2279 * function will descend into containers. op is the object to start the search
2406 * from. 2280 * from.
2407 */ 2281 */
2282static void
2283drop_unpaid_items (object *op, object *env)
2284{
2285 while (op)
2286 {
2287 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2288
2289 if (QUERY_FLAG (op, FLAG_UNPAID))
2290 op->insert_at (env);
2291 else if (op->inv)
2292 drop_unpaid_items (op->inv, env);
2293
2294 op = next;
2295 }
2296}
2297
2408void 2298void
2409remove_unpaid_objects (object *op, object *env) 2299object::drop_unpaid_items ()
2410{ 2300{
2411 object *next; 2301 if (!flag [FLAG_REMOVED])
2412 2302 ::drop_unpaid_items (inv, this);
2413 while (op)
2414 {
2415 next = op->below; /* Make sure we have a good value, in case
2416 * we remove object 'op'
2417 */
2418 if (QUERY_FLAG (op, FLAG_UNPAID))
2419 {
2420 op->remove ();
2421 op->x = env->x;
2422 op->y = env->y;
2423 if (env->type == PLAYER)
2424 esrv_del_item (env->contr, op->count);
2425 insert_ob_in_map (op, env->map, NULL, 0);
2426 }
2427 else if (op->inv)
2428 remove_unpaid_objects (op->inv, env);
2429
2430 op = next;
2431 }
2432} 2303}
2433 2304
2434/* 2305/*
2435 * Returns pointer a static string containing gravestone text 2306 * Returns pointer a static string containing gravestone text
2436 * Moved from apply.c to player.c - player.c is what 2307 * Moved from apply.c to player.c - player.c is what
2437 * actually uses this function. player.c may not be quite the 2308 * actually uses this function. player.c may not be quite the
2438 * best, a misc file for object actions is probably better, 2309 * best, a misc file for object actions is probably better,
2439 * but there isn't one in the server directory. 2310 * but there isn't one in the server directory.
2440 */ 2311 */
2441char * 2312const char *
2442gravestone_text (object *op) 2313gravestone_text (object *op)
2443{ 2314{
2444 static char buf2[MAX_BUF]; 2315 static dynbuf_text buf;
2445 char buf[MAX_BUF];
2446 time_t now = time (NULL);
2447 2316
2448 strcpy (buf2, " R.I.P.\n\n"); 2317 buf << "---- R.I.P. ----\n\n";
2318 op->name;
2319
2449 if (op->type == PLAYER) 2320 if (op->type == PLAYER)
2450 sprintf (buf, "%s the %s\n", &op->name, op->contr->title); 2321 buf << " the " << op->contr->title;
2451 else
2452 sprintf (buf, "%s\n", &op->name);
2453 2322
2454 strncat (buf2, " ", 20 - strlen (buf) / 2); 2323 buf << "\n\n";
2455 strcat (buf2, buf); 2324
2325 buf << "who was level ";
2326 buf << (sint32)op->level << "\n\n" // OO breakdown
2327 << " when " << (op->contr ? "killed" : "died") << "\n\n";
2328
2456 if (op->type == PLAYER) 2329 if (op->type == PLAYER)
2457 sprintf (buf, "who was in level %d when killed\n", op->level); 2330 buf << "by " << op->contr->killer_name () << ".\n\n";
2458 else
2459 sprintf (buf, "who was in level %d when died.\n\n", op->level);
2460 2331
2461 strncat (buf2, " ", 20 - strlen (buf) / 2);
2462 strcat (buf2, buf);
2463 if (op->type == PLAYER)
2464 { 2332 {
2465 sprintf (buf, "by %s.\n\n", op->contr->killer); 2333 static char buf2[128];
2466 strncat (buf2, " ", 21 - strlen (buf) / 2); 2334 time_t now = time (NULL);
2467 strcat (buf2, buf);
2468 }
2469
2470 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now)); 2335 strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2471 strncat (buf2, " ", 20 - strlen (buf) / 2); 2336 buf << buf2;
2472 strcat (buf2, buf); 2337 }
2473 2338
2474 return buf2; 2339 return buf;
2475} 2340}
2476 2341
2477void 2342void
2478do_some_living (object *op) 2343do_some_living (object *op)
2479{ 2344{
… …
2486 int rate_grace = 2000; 2351 int rate_grace = 2000;
2487 const int max_hp = 1; 2352 const int max_hp = 1;
2488 const int max_sp = 1; 2353 const int max_sp = 1;
2489 const int max_grace = 1; 2354 const int max_grace = 1;
2490 2355
2491 if (op->contr->outputs_sync) 2356 if (op->contr->hidden)
2357 {
2358 op->invisible = 1000;
2359 /* the socket code flashes the player visible/invisible
2360 * depending on the value of invisible, so we need to
2361 * alternate it here for it to work correctly.
2362 */
2363 if (pticks & 2)
2364 op->invisible--;
2492 { 2365 }
2493 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2366 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2494 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2367 {
2495 flush_output_element (op, &op->contr->outputs[i]); 2368 if (!op->invisible--)
2369 {
2370 make_visible (op);
2371 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2372 }
2496 } 2373 }
2497 2374
2498 if (op->contr->ns->state == ST_PLAYING) 2375 if (op->contr->ns->state == ST_PLAYING)
2499 { 2376 {
2500 /* these next three if clauses make it possible to SLOW DOWN 2377 /* these next three if clauses make it possible to SLOW DOWN
… …
2519 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2396 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2520 else 2397 else
2521 { 2398 {
2522 gen_grace = op->stats.maxgrace; 2399 gen_grace = op->stats.maxgrace;
2523 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2400 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2524 }
2525
2526 /* Regenerate Spell Points */
2527 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)
2528 {
2529 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2530 if (op->stats.sp < op->stats.maxsp)
2531 {
2532 op->stats.sp++;
2533 /* dms do not consume food */
2534 if (!QUERY_FLAG (op, FLAG_WIZ))
2535 {
2536 op->stats.food--;
2537 if (op->contr->digestion < 0)
2538 op->stats.food += op->contr->digestion;
2539 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2540 op->stats.food = last_food;
2541 }
2542 }
2543
2544 if (max_sp > 1)
2545 {
2546 over_sp = (gen_sp + 10) / rate_sp;
2547 if (over_sp > 0)
2548 {
2549 if (op->stats.sp < op->stats.maxsp)
2550 {
2551 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2552
2553 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2554 op->stats.sp--;
2555
2556 if (op->stats.sp > op->stats.maxsp)
2557 op->stats.sp = op->stats.maxsp;
2558 }
2559 op->last_sp = 0;
2560 }
2561 else
2562 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2563 }
2564 else
2565 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2566 } 2401 }
2567 2402
2568 /* Regenerate Grace */ 2403 /* Regenerate Grace */
2569 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2404 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2570 if (--op->last_grace < 0) 2405 if (--op->last_grace < 0)
… …
2591 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2426 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2592 } 2427 }
2593 /* wearing stuff doesn't detract from grace generation. */ 2428 /* wearing stuff doesn't detract from grace generation. */
2594 } 2429 }
2595 2430
2431 if (op->stats.food > 0)
2432 {
2596 /* Regenerate Hit Points */ 2433 /* Regenerate Spell Points */
2597 if (--op->last_heal < 0) 2434 if (!op->contr->golem && --op->last_sp < 0)
2598 {
2599 if (op->stats.hp < op->stats.maxhp)
2600 { 2435 {
2601 op->stats.hp++; 2436 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2602 /* dms do not consume food */ 2437
2603 if (!QUERY_FLAG (op, FLAG_WIZ)) 2438 if (op->stats.sp < op->stats.maxsp)
2604 { 2439 {
2440 op->stats.sp++;
2441
2442 /* dms do not consume food */
2443 if (!QUERY_FLAG (op, FLAG_WIZ))
2444 {
2605 op->stats.food--; 2445 op->stats.food--;
2446
2606 if (op->contr->digestion < 0) 2447 if (op->contr->digestion < 0)
2607 op->stats.food += op->contr->digestion; 2448 op->stats.food += op->contr->digestion;
2608 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2449 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2609 op->stats.food = last_food; 2450 op->stats.food = last_food;
2451 }
2610 } 2452 }
2611 }
2612 2453
2613 if (max_hp > 1) 2454 if (max_sp > 1)
2614 {
2615 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2616 if (over_hp > 0)
2617 { 2455 {
2618 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2456 over_sp = (gen_sp + 10) / rate_sp;
2457 if (over_sp > 0)
2458 {
2459 if (op->stats.sp < op->stats.maxsp)
2460 {
2461 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2462
2463 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2464 op->stats.sp--;
2465
2466 if (op->stats.sp > op->stats.maxsp)
2467 op->stats.sp = op->stats.maxsp;
2468 }
2469
2619 op->last_heal = 0; 2470 op->last_sp = 0;
2471 }
2472 else
2473 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2620 } 2474 }
2621 else 2475 else
2476 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2477 }
2478
2479 /* Regenerate Hit Points */
2480 if (--op->last_heal < 0)
2481 {
2482 if (op->stats.hp < op->stats.maxhp)
2622 { 2483 {
2623 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2484 op->stats.hp++;
2485
2486 /* dms do not consume food */
2487 if (!QUERY_FLAG (op, FLAG_WIZ))
2488 {
2489 op->stats.food--;
2490
2491 if (op->contr->digestion < 0)
2492 op->stats.food += op->contr->digestion;
2493 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2494 op->stats.food = last_food;
2495 }
2624 } 2496 }
2497
2498 if (max_hp > 1)
2499 {
2500 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2501
2502 if (over_hp > 0)
2503 {
2504 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2505 op->last_heal = 0;
2506 }
2507 else
2508 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2625 } 2509 }
2626 else 2510 else
2627 {
2628 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2511 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2629 } 2512 }
2630 } 2513 }
2631 2514
2632 /* Digestion */ 2515 /* Digestion */
2633 if (--op->last_eat < 0) 2516 if (--op->last_eat < 0)
2634 { 2517 {
2635#ifdef COZY_SERVER 2518 int bonus = max (0, op->contr->digestion),
2636 int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion; 2519 penalty = max (0, -op->contr->digestion);
2637 int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2638#else
2639 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2640#endif
2641 2520
2642 if (op->contr->gen_hp > 0)
2643 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2521 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2644 else
2645 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2646 2522
2647 /* dms do not consume food */ 2523 /* dms do not consume food */
2648 if (!QUERY_FLAG (op, FLAG_WIZ)) 2524 if (!QUERY_FLAG (op, FLAG_WIZ))
2649 op->stats.food--; 2525 op->stats.food--;
2650 } 2526 }
2651 2527
2652 if (op->stats.food < 0 && op->stats.hp >= 0) 2528 if (op->stats.food < 0 && op->stats.hp >= 0)
2653 { 2529 {
2654 object *tmp, *flesh = 0; 2530 object *flesh = 0;
2655 2531
2656 for (tmp = op->inv; tmp; tmp = tmp->below) 2532 for_inv_removable (op, tmp)
2657 { 2533 {
2658 if (!QUERY_FLAG (tmp, FLAG_UNPAID)) 2534 if (QUERY_FLAG (tmp, FLAG_UNPAID))
2535 continue;
2536
2537 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2659 { 2538 {
2660 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2539 op->statusmsg ("You blindly grab for a bite of food. "
2661 { 2540 "H<To prevent you from starving, you ate some random item from your backpack.>");
2662 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2663 manual_apply (op, tmp, 0); 2541 manual_apply (op, tmp, 0);
2542
2664 if (op->stats.food >= 0 || op->stats.hp < 0) 2543 if (op->stats.food >= 0 || op->stats.hp < 0)
2665 break; 2544 break;
2666 } 2545 }
2667 else if (tmp->type == FLESH) 2546 else if (tmp->type == FLESH)
2668 flesh = tmp; 2547 flesh = tmp;
2669 } /* End if paid for object */ 2548 }
2670 } /* end of for loop */
2671 2549
2672 /* If player is still starving, it means they don't have any food, so 2550 /* If player is still starving, it means they don't have any food, so
2673 * eat flesh instead. 2551 * eat flesh instead.
2674 */ 2552 */
2675 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2553 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2676 { 2554 {
2677 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2555 op->statusmsg ("You blindly grab for a bite of food. "
2556 "H<To prevent you from starving, you ate some random item from your backpack.>");
2678 manual_apply (op, flesh, 0); 2557 manual_apply (op, flesh, 0);
2679 } 2558 }
2559
2560 // If player is still starving, alert him!
2561 if (op->stats.food < 0)
2562 op->failmsg ("You are starving! "
2563 "H<Eat some food to increase your food and prevent you from an untimely death.>");
2564 }
2565
2566 if (op->stats.food < 0)
2680 } 2567 {
2568 op->stats.hp += op->stats.food;
2569 op->stats.food = 0;
2681 2570
2682 while (op->stats.food < 0 && op->stats.hp >= 0) 2571 if (op->stats.hp < 0)
2683 op->stats.food++, op->stats.hp--; 2572 {
2573 op->contr->killer = archetype::get ("killer_starvation");
2574 op->contr->killer->destroy ();
2575 }
2576 }
2684 2577
2578 /* killer should be set here already */
2685 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2579 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2686 kill_player (op); 2580 kill_player (op);
2687 } 2581 }
2688} 2582}
2689 2583
… …
2693 * file. 2587 * file.
2694 */ 2588 */
2695void 2589void
2696kill_player (object *op) 2590kill_player (object *op)
2697{ 2591{
2592 int x, y;
2698 char buf[MAX_BUF]; 2593 char buf[MAX_BUF];
2699 int x, y;
2700
2701 //int i;
2702 maptile *map; /* this is for resurrection */ 2594 maptile *map; /* this is for resurrection */
2703
2704 /* int z;
2705 int num_stats_lose;
2706 int lost_a_stat;
2707 int lose_this_stat;
2708 int this_stat; */
2709 int will_kill_again; 2595 int will_kill_again;
2710 archetype *at; 2596 archetype *at;
2711 object *tmp; 2597 object *tmp;
2712 2598
2713 if (save_life (op)) 2599 if (save_life (op))
2714 return; 2600 return;
2715
2716 2601
2717 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2602 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2718 * in cities ONLY!!! It is very important that this doesn't get abused. 2603 * in cities ONLY!!! It is very important that this doesn't get abused.
2719 * Look at op_on_battleground() for more info --AndreasV 2604 * Look at op_on_battleground() for more info --AndreasV
2720 */ 2605 */
… …
2723 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); 2608 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");
2724 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life..."); 2609 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2725 2610
2726 /* restore player */ 2611 /* restore player */
2727 at = archetype::find ("poisoning"); 2612 at = archetype::find ("poisoning");
2728 tmp = present_arch_in_ob (at, op); 2613 if (object *tmp = present_arch_in_ob (at, op))
2729 if (tmp)
2730 { 2614 {
2731 tmp->destroy (); 2615 tmp->destroy ();
2732 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2616 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2733 } 2617 }
2734 2618
2735 at = archetype::find ("confusion"); 2619 at = archetype::find ("confusion");
2736 tmp = present_arch_in_ob (at, op); 2620 if (object *tmp = present_arch_in_ob (at, op))
2737 if (tmp)
2738 { 2621 {
2739 tmp->destroy (); 2622 tmp->destroy ();
2740 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2623 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2741 } 2624 }
2742 2625
2743 cure_disease (op, 0); /* remove any disease */ 2626 cure_disease (op, 0, 0); /* remove any disease */
2744 op->stats.hp = op->stats.maxhp; 2627 op->stats.hp = op->stats.maxhp;
2745 if (op->stats.food <= 0) 2628 if (op->stats.food <= 0)
2746 op->stats.food = 999; 2629 op->stats.food = 999;
2747 2630
2748 /* create a bodypart-trophy to make the winner happy */ 2631 /* create a bodypart-trophy to make the winner happy */
2749 tmp = arch_to_object (archetype::find ("finger")); 2632 if (object *tmp = arch_to_object (archetype::find ("finger")))
2750 if (tmp != NULL)
2751 { 2633 {
2752 sprintf (buf, "%s's finger", &op->name); 2634 tmp->name = format ("%s's finger" , &op->name);
2753 tmp->name = buf; 2635 tmp->name_pl = format ("%s's fingers", &op->name);
2754 sprintf (buf, " This finger has been cut off %s\n"
2755 " the %s, when he was defeated at\n level %d by %s.\n",
2756 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2757 tmp->msg = buf; 2636 tmp->msg = format (
2637 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2638 &op->name, op->contr->title,
2639 (int)op->level,
2640 op->contr->killer_name ()
2641 );
2758 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2642 tmp->value = 0, tmp->type = 0;
2759 tmp->materialname = NULL; 2643 tmp->materialname = "organics";
2760 tmp->x = op->x, tmp->y = op->y; 2644 tmp->insert_at (op, tmp);
2761 insert_ob_in_map (tmp, op->map, op, 0);
2762 } 2645 }
2763 2646
2764 /* teleport defeated player to new destination */ 2647 /* teleport defeated player to new destination */
2765 transfer_ob (op, x, y, 0, NULL); 2648 transfer_ob (op, x, y, 0, NULL);
2766 op->contr->braced = 0; 2649 op->contr->braced = 0;
… …
2769 2652
2770 INVOKE_PLAYER (DEATH, op->contr); 2653 INVOKE_PLAYER (DEATH, op->contr);
2771 2654
2772 command_kill_pets (op, 0); 2655 command_kill_pets (op, 0);
2773 2656
2774 if (op->stats.food < 0) 2657 op->contr->play_sound (sound_find ("player_dies"));
2775 {
2776 if (op->contr->explore)
2777 {
2778 new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2779 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2780 op->stats.food = 999;
2781 return;
2782 }
2783 sprintf (buf, "%s starved to death.", &op->name);
2784 strcpy (op->contr->killer, "starvation");
2785 }
2786 else
2787 {
2788 if (op->contr->explore)
2789 {
2790 new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2791 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2792 op->stats.hp = op->stats.maxhp;
2793 return;
2794 }
2795 sprintf (buf, "%s died.", &op->name);
2796 }
2797 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2798 2658
2799 /* save the map location for corpse, gravestone */ 2659 /* save the map location for corpse, gravestone */
2800 x = op->x; 2660 x = op->x;
2801 y = op->y; 2661 y = op->y;
2802 map = op->map; 2662 map = op->map;
2803
2804 2663
2805 /* NOT_PERMADEATH code. This basically brings the character back to 2664 /* NOT_PERMADEATH code. This basically brings the character back to
2806 * life if they are dead - it takes some exp and a random stat. 2665 * life if they are dead - it takes some exp and a random stat.
2807 * See the config.h file for a little more in depth detail about this. 2666 * See the config.h file for a little more in depth detail about this.
2808 */ 2667 */
… …
2825 num_stats_lose = 1; 2684 num_stats_lose = 1;
2826 else 2685 else
2827 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO; 2686 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
2828 } 2687 }
2829 else 2688 else
2830 {
2831 num_stats_lose = 1; 2689 num_stats_lose = 1;
2832 } 2690
2833 lost_a_stat = 0; 2691 lost_a_stat = 0;
2834 2692
2835 for (z = 0; z < num_stats_lose; z++) 2693 for (z = 0; z < num_stats_lose; z++)
2836 { 2694 {
2837 i = RANDOM () % NUM_STATS; 2695 i = RANDOM () % NUM_STATS;
… …
2911 lost_a_stat = 1; 2769 lost_a_stat = 1;
2912 } 2770 }
2913 } 2771 }
2914 } 2772 }
2915 } 2773 }
2774
2916 /* If no stat lost, tell the player. */ 2775 /* If no stat lost, tell the player. */
2917 if (!lost_a_stat) 2776 if (!lost_a_stat)
2918 { 2777 {
2919 /* determine_god() seems to not work sometimes... why is this? 2778 /* determine_god() seems to not work sometimes... why is this?
2920 Should I be using something else? GD */ 2779 Should I be using something else? GD */
… …
2924 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god); 2783 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
2925 else 2784 else
2926 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you."); 2785 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
2927 } 2786 }
2928#else 2787#else
2929 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely."); 2788 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely.");
2930#endif 2789#endif
2931 2790
2932 /* Put a gravestone up where the character 'almost' died. List the 2791 /* Put a gravestone up where the character 'almost' died. List the
2933 * exp loss on the stone. 2792 * exp loss on the stone.
2934 */ 2793 */
2935 tmp = arch_to_object (archetype::find ("gravestone")); 2794 tmp = arch_to_object (archetype::find ("gravestone"));
2936 sprintf (buf, "%s's gravestone", &op->name); 2795 tmp->name = format ("%s's gravestone", &op->name);
2937 tmp->name = buf; 2796 tmp->name_pl = format ("%s's gravestones", &op->name);
2938 sprintf (buf, "%s's gravestones", &op->name);
2939 tmp->name_pl = buf;
2940 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); 2797 tmp->msg = format ("RIP\nHere rests the hero %s the %s,\nwho was killed\nby %s.\n", &op->name, op->contr->title, op->contr->killer_name ());
2941 tmp->msg = buf;
2942 tmp->x = op->x, tmp->y = op->y; 2798 tmp->x = op->x, tmp->y = op->y;
2943 insert_ob_in_map (tmp, op->map, NULL, 0); 2799 insert_ob_in_map (tmp, op->map, NULL, 0);
2944 2800
2945 /**************************************/ 2801 /**************************************/
2946 /* */ 2802 /* */
… …
2967 { 2823 {
2968 tmp->destroy (); 2824 tmp->destroy ();
2969 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2825 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2970 } 2826 }
2971 2827
2972 cure_disease (op, 0); /* remove any disease */ 2828 cure_disease (op, 0, 0); /* remove any disease */
2829
2830 // remove all spell effects that are active
2831 // to avoid long-term effects such as word-of-recall
2832 for (object *item = op->inv; item; )
2833 {
2834 object *next = item->below;
2835
2836 if (item->type == SPELL_EFFECT && item->active)
2837 item->destroy ();
2838
2839 item = next;
2840 }
2973 2841
2974 /*add_exp(op, (op->stats.exp * -0.20)); */ 2842 /*add_exp(op, (op->stats.exp * -0.20)); */
2975 apply_death_exp_penalty (op); 2843 apply_death_exp_penalty (op);
2844
2976 if (op->stats.food < 100) 2845 if (op->stats.food < 100)
2977 op->stats.food = 900; 2846 op->stats.food = 900;
2847
2978 op->stats.hp = op->stats.maxhp; 2848 op->stats.hp = op->stats.maxhp;
2979 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2849 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2980 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2850 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2981 2851
2982 /* 2852 /*
2983 * Check to see if the player is in a shop. IF so, then check to see if
2984 * the player has any unpaid items. If so, remove them and put them back 2853 * Check to see if the player has any unpaid items. If so, remove them
2985 * in the map. 2854 * and put them back in the map.
2986 */ 2855 */
2987 2856 op->drop_unpaid_items ();
2988 if (is_in_shop (op))
2989 remove_unpaid_objects (op->inv, op);
2990 2857
2991 /****************************************/ 2858 /****************************************/
2992 /* */ 2859 /* */
2993 /* Move player to his current respawn- */ 2860 /* Move player to his current respawn- */
2994 /* position (usually last savebed) */ 2861 /* position (usually last savebed) */
2995 /* */ 2862 /* */
2996 /****************************************/ 2863 /****************************************/
2997 2864
2998 enter_player_savebed (op); 2865 enter_player_savebed (op);
2999 2866
3000 /* Save the player before inserting the force to reduce
3001 * chance of abuse.
3002 */
3003 op->contr->braced = 0; 2867 op->contr->braced = 0;
3004 op->contr->save ();
3005 2868
3006 /* it is possible that the player has blown something up 2869 /* it is possible that the player has blown something up
3007 * at his savebed location, and that can have long lasting 2870 * at his savebed location, and that can have long lasting
3008 * spell effects. So first see if there is a spell effect 2871 * spell effects. So first see if there is a spell effect
3009 * on the space that might harm the player. 2872 * on the space that might harm the player.
… …
3018 object *force; 2881 object *force;
3019 int at; 2882 int at;
3020 2883
3021 force = get_archetype (FORCE_NAME); 2884 force = get_archetype (FORCE_NAME);
3022 /* 50 ticks should be enough time for the spell to abate */ 2885 /* 50 ticks should be enough time for the spell to abate */
3023 force->speed = 0.1; 2886 force->speed = 0.1f;
3024 force->speed_left = -5.0; 2887 force->speed_left = -5.f;
3025 SET_FLAG (force, FLAG_APPLIED); 2888 SET_FLAG (force, FLAG_APPLIED);
3026 for (at = 0; at < NROFATTACKS; at++) 2889 for (at = 0; at < NROFATTACKS; at++)
3027 if (will_kill_again & (1 << at)) 2890 if (will_kill_again & (1 << at))
3028 force->resist[at] = 100; 2891 force->resist[at] = 100;
3029 2892
… …
3038void 2901void
3039loot_object (object *op) 2902loot_object (object *op)
3040{ /* Grab and destroy some treasure */ 2903{ /* Grab and destroy some treasure */
3041 object *tmp, *tmp2, *next; 2904 object *tmp, *tmp2, *next;
3042 2905
3043 if (op->container) 2906 op->close_container (); /* close open sack first */
3044 esrv_apply_container (op, op->container); /* close open sack first */
3045 2907
3046 for (tmp = op->inv; tmp; tmp = next) 2908 for (tmp = op->inv; tmp; tmp = next)
3047 { 2909 {
3048 next = tmp->below; 2910 next = tmp->below;
3049 2911
3050 if (tmp->invisible) 2912 if (tmp->invisible)
3051 continue; 2913 continue;
3052 2914
3053 tmp->remove (); 2915 tmp->remove ();
3054 tmp->x = op->x, tmp->y = op->y; 2916 tmp->x = op->x, tmp->y = op->y;
2917
3055 if (tmp->type == CONTAINER) 2918 if (tmp->type == CONTAINER)
3056 { /* empty container to ground */ 2919 loot_object (tmp); /* empty container to ground */
3057 loot_object (tmp); 2920
3058 }
3059 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2921 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3060 { 2922 {
3061 if (tmp->nrof > 1) 2923 if (tmp->nrof > 1)
3062 { 2924 {
3063 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2925 tmp->decrease (rndm (1, tmp->nrof - 1));
3064 tmp2->destroy ();
3065 insert_ob_in_map (tmp, op->map, NULL, 0); 2926 insert_ob_in_map (tmp, op->map, NULL, 0);
3066 } 2927 }
3067 else 2928 else
3068 tmp->destroy (); 2929 tmp->destroy ();
3069 } 2930 }
… …
3075/* 2936/*
3076 * fix_weight(): Check recursively the weight of all players, and fix 2937 * fix_weight(): Check recursively the weight of all players, and fix
3077 * what needs to be fixed. Refresh windows and fix speed if anything 2938 * what needs to be fixed. Refresh windows and fix speed if anything
3078 * was changed. 2939 * was changed.
3079 */ 2940 */
3080
3081void 2941void
3082fix_weight (void) 2942fix_weight (void)
3083{ 2943{
3084 for_all_players (pl) 2944 for_all_players (pl)
3085 { 2945 {
3086 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2946 sint32 old = pl->ob->carrying;
3087 2947
3088 if (old == sum) 2948 pl->ob->update_weight ();
3089 continue; 2949
2950 if (old != pl->ob->carrying)
2951 {
3090 pl->ob->update_stats (); 2952 pl->ob->update_stats ();
3091 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum); 2953 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
2954 }
3092 } 2955 }
3093} 2956}
3094 2957
3095void 2958void
3096fix_luck (void) 2959fix_luck (void)
… …
3140void 3003void
3141make_visible (object *op) 3004make_visible (object *op)
3142{ 3005{
3143 op->hide = 0; 3006 op->hide = 0;
3144 op->invisible = 0; 3007 op->invisible = 0;
3008
3145 if (op->type == PLAYER) 3009 if (op->type == PLAYER)
3146 { 3010 {
3147 op->contr->tmp_invis = 0; 3011 op->contr->tmp_invis = 0;
3148 op->contr->invis_race = 0; 3012 op->contr->invis_race = 0;
3149 } 3013 }
3014
3150 update_object (op, UP_OBJ_FACE); 3015 update_object (op, UP_OBJ_CHANGE);
3151} 3016}
3152 3017
3153int 3018int
3154is_true_undead (object *op) 3019is_true_undead (object *op)
3155{ 3020{
3156 object *tmp = NULL;
3157
3158 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3021 if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3159 return 1; 3022 return 1;
3160 3023
3161 return 0; 3024 return 0;
3162} 3025}
3163 3026
3164/* look at the surrounding terrain to determine 3027/* look at the surrounding terrain to determine
3165 * the hideability of this object. Positive levels 3028 * the hideability of this object. Positive levels
3166 * indicate greater hideability. 3029 * indicate greater hideability.
3167 */ 3030 */
3168
3169int 3031int
3170hideability (object *ob) 3032hideability (object *ob)
3171{ 3033{
3172 int i, level = 0, mflag; 3034 int i, level = 0, mflag;
3173 sint16 x, y; 3035 sint16 x, y;
… …
3183 * as bad as carrying a light on a pitch dark map */ 3045 * as bad as carrying a light on a pitch dark map */
3184 if (has_carried_lights (ob)) 3046 if (has_carried_lights (ob))
3185 level = -(10 + (2 * ob->map->darkness)); 3047 level = -(10 + (2 * ob->map->darkness));
3186 3048
3187 /* scan through all nearby squares for terrain to hide in */ 3049 /* scan through all nearby squares for terrain to hide in */
3188 for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i]) 3050 for (i = 0, x = ob->x, y = ob->y;
3051 i <= SIZEOFFREE1;
3052 i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3189 { 3053 {
3190 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL); 3054 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3191 if (mflag & P_OUT_OF_MAP) 3055 if (mflag & P_OUT_OF_MAP)
3192 {
3193 continue; 3056 continue;
3194 } 3057
3195 if (mflag & P_BLOCKSVIEW) /* something to hide near! */ 3058 if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3196 level += 2; 3059 level += 2;
3197 else /* open terrain! */ 3060 else /* open terrain! */
3198 level -= 1; 3061 level -= 1;
3199 } 3062 }
… …
3207/* For Hidden creatures - a chance of becoming 'unhidden' 3070/* For Hidden creatures - a chance of becoming 'unhidden'
3208 * every time they move - as we subtract off 'invisibility' 3071 * every time they move - as we subtract off 'invisibility'
3209 * AND, for players, if they move into a ridiculously unhideable 3072 * AND, for players, if they move into a ridiculously unhideable
3210 * spot (surrounded by clear terrain in broad daylight). -b.t. 3073 * spot (surrounded by clear terrain in broad daylight). -b.t.
3211 */ 3074 */
3212
3213void 3075void
3214do_hidden_move (object *op) 3076do_hidden_move (object *op)
3215{ 3077{
3216 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3078 int hide = 0;
3217 object *skop;
3218 3079
3219 if (!op || !op->map) 3080 if (!op || !op->map)
3220 return; 3081 return;
3221 3082
3222 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3083 object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3084 int num = random_roll (0, 19, op, PREFER_LOW);
3223 3085
3224 /* its *extremely* hard to run and sneak/hide at the same time! */ 3086 /* its *extremely* hard to run and sneak/hide at the same time! */
3225 if (op->type == PLAYER && op->contr->run_on) 3087 if (op->type == PLAYER && op->contr->run_on)
3226 {
3227 if (!skop || num >= skop->level) 3088 if (!skop || num >= skop->level)
3228 { 3089 {
3229 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!"); 3090 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3230 make_visible (op); 3091 make_visible (op);
3231 return; 3092 return;
3232 } 3093 }
3233 else 3094 else
3234 num += 20; 3095 num += 20;
3235 } 3096
3236 num += op->map->difficulty; 3097 num += op->map->difficulty;
3237 hide = hideability (op); /* modify by terrain hidden level */ 3098 hide = hideability (op); /* modify by terrain hidden level */
3238 num -= hide; 3099 num -= hide;
3100
3239 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3101 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3240 { 3102 {
3241 make_visible (op); 3103 make_visible (op);
3104
3242 if (op->type == PLAYER) 3105 if (op->type == PLAYER)
3243 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3106 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3244 } 3107 }
3245 else if (op->type == PLAYER && skop) 3108 else if (op->type == PLAYER && skop)
3246 {
3247 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3109 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3248 }
3249} 3110}
3250 3111
3251/* determine if who is standing near a hostile creature. */ 3112/* determine if who is standing near a hostile creature. */
3252 3113
3253int 3114int
… …
3301 * object op. This function works fine for monsters, 3162 * object op. This function works fine for monsters,
3302 * but we dont worry if the object isnt the top one in 3163 * but we dont worry if the object isnt the top one in
3303 * a pile (say a coin under a table would return "viewable" 3164 * a pile (say a coin under a table would return "viewable"
3304 * by this routine). Another question, should we be 3165 * by this routine). Another question, should we be
3305 * concerned with the direction the player is looking 3166 * concerned with the direction the player is looking
3306 * in? Realistically, most of use cant see stuff behind 3167 * in? Realistically, most of us can't see stuff behind
3307 * our backs...on the other hand, does the "facing" direction 3168 * our backs...on the other hand, does the "facing" direction
3308 * imply the way your head, or body is facing? Its possible 3169 * imply the way your head, or body is facing? It's possible
3309 * for them to differ. Sigh, this fctn could get a bit more complex. 3170 * for them to differ. Sigh, this fctn could get a bit more complex.
3310 * -b.t. 3171 * -b.t.
3311 * This function is now map tiling safe. 3172 * This function is now map tiling safe.
3312 */ 3173 */
3313
3314int 3174int
3315player_can_view (object *pl, object *op) 3175player_can_view (object *pl, object *op)
3316{ 3176{
3317 rv_vector rv; 3177 rv_vector rv;
3318 int dx, dy; 3178 int dx, dy;
… …
3320 if (pl->type != PLAYER) 3180 if (pl->type != PLAYER)
3321 { 3181 {
3322 LOG (llevError, "player_can_view() called for non-player object\n"); 3182 LOG (llevError, "player_can_view() called for non-player object\n");
3323 return -1; 3183 return -1;
3324 } 3184 }
3185
3325 if (!pl || !op) 3186 if (!pl || !op)
3326 return 0; 3187 return 0;
3327 3188
3328 if (op->head)
3329 {
3330 op = op->head; 3189 op = op->head_ ();
3331 } 3190
3332 get_rangevector (pl, op, &rv, 0x1); 3191 get_rangevector (pl, op, &rv, 0x1);
3333 3192
3334 /* starting with the 'head' part, lets loop 3193 /* starting with the 'head' part, lets loop
3335 * through the object and find if it has any 3194 * through the object and find if it has any
3336 * part that is in the los array but isnt on 3195 * part that is in the los array but isn't on
3337 * a blocked los square. 3196 * a blocked los square.
3338 * we use the archetype to figure out offsets. 3197 * we use the archetype to figure out offsets.
3339 */ 3198 */
3340 while (op) 3199 while (op)
3341 { 3200 {
3342 dx = rv.distance_x + op->arch->clone.x; 3201 dx = rv.distance_x + op->arch->x;
3343 dy = rv.distance_y + op->arch->clone.y; 3202 dy = rv.distance_y + op->arch->y;
3344 3203
3345 /* only the viewable area the player sees is updated by LOS 3204 /* only the viewable area the player sees is updated by LOS
3346 * code, so we need to restrict ourselves to that range of values 3205 * code, so we need to restrict ourselves to that range of values
3347 * for any meaningful values. 3206 * for any meaningful values.
3348 */ 3207 */
3349 if (FABS (dx) <= (pl->contr->ns->mapx / 2) && 3208 if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3350 FABS (dy) <= (pl->contr->ns->mapy / 2) && 3209 abs (dy) <= (pl->contr->ns->mapy / 2) &&
3351 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)]) 3210 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3352 return 1; 3211 return 1;
3212
3353 op = op->more; 3213 op = op->more;
3354 } 3214 }
3215
3355 return 0; 3216 return 0;
3356} 3217}
3357 3218
3358/* routine for both players and monsters. We call this when 3219/* routine for both players and monsters. We call this when
3359 * there is a possibility for our action distrubing our hiding 3220 * there is a possibility for our action distrubing our hiding
… …
3362 * return 0. 3223 * return 0.
3363 */ 3224 */
3364int 3225int
3365action_makes_visible (object *op) 3226action_makes_visible (object *op)
3366{ 3227{
3367
3368 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 3228 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3369 { 3229 {
3370 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 3230 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3371 return 0; 3231 return 0;
3372 3232
… …
3378 { 3238 {
3379 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible"); 3239 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3380 return 1; 3240 return 1;
3381 } 3241 }
3382 } 3242 }
3243
3383 return 0; 3244 return 0;
3384} 3245}
3385 3246
3386/* op_on_battleground - checks if the given object op (usually 3247/* op_on_battleground - checks if the given object op (usually
3387 * a player) is standing on a valid battleground-tile, 3248 * a player) is standing on a valid battleground-tile,
… …
3392 * Default is to do the same as before, so only people wanting to have different points need worry about this 3253 * Default is to do the same as before, so only people wanting to have different points need worry about this
3393 */ 3254 */
3394int 3255int
3395op_on_battleground (object *op, int *x, int *y) 3256op_on_battleground (object *op, int *x, int *y)
3396{ 3257{
3397 object *tmp;
3398
3399 /* A battleground-tile needs the following attributes to be valid: 3258 /* A battleground-tile needs the following attributes to be valid:
3400 * is_floor 1 (has to be the FIRST floor beneath the player's feet), 3259 * is_floor 1 (has to be the FIRST floor beneath the player's feet),
3401 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND) 3260 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3402 * and the exit-coordinates sp/hp must both be > 0. 3261 * and the exit-coordinates sp/hp must both be > 0.
3403 * => The intention here is to prevent abuse of the battleground- 3262 * => The intention here is to prevent abuse of the battleground-
3404 * feature (like pickable or hidden battleground tiles). */ 3263 * feature (like pickable or hidden battleground tiles). */
3405 for (tmp = op->below; tmp != NULL; tmp = tmp->below) 3264 for (object *tmp = op->below; tmp; tmp = tmp->below)
3406 { 3265 {
3407 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3266 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3408 { 3267 {
3409 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && 3268 if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3410 strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp)) 3269 && tmp->type == BATTLEGROUND
3270 && tmp->name == shstr_battleground
3271 && EXIT_X (tmp) && EXIT_Y (tmp))
3411 { 3272 {
3412 /*before we assign the exit, check if this is a teambattle */ 3273 /* before we assign the exit, check if this is a teambattle */
3413 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3274 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3414 { 3275 {
3415 object *invtmp;
3416
3417 for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below) 3276 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3418 { 3277 {
3419 if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying)) 3278 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3420 { 3279 {
3421 if (x != NULL && y != NULL) 3280 if (x && y)
3422 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3281 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3282
3423 return 1; 3283 return 1;
3424 } 3284 }
3425 } 3285 }
3426 } 3286 }
3287
3427 if (x != NULL && y != NULL) 3288 if (x && y)
3428 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3289 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3290
3429 return 1; 3291 return 1;
3430 } 3292 }
3431 } 3293 }
3432 } 3294 }
3295
3433 /* If we got here, did not find a battleground */ 3296 /* If we got here, did not find a battleground */
3434 return 0; 3297 return 0;
3435} 3298}
3436 3299
3437/* 3300/*
… …
3453 char buf[MAX_BUF]; /* tmp. string buffer */ 3316 char buf[MAX_BUF]; /* tmp. string buffer */
3454 int i = 0, j = 0; 3317 int i = 0, j = 0;
3455 3318
3456 /* get the appropriate treasurelist */ 3319 /* get the appropriate treasurelist */
3457 if (atnr == ATNR_FIRE) 3320 if (atnr == ATNR_FIRE)
3458 trlist = find_treasurelist ("dragon_ability_fire"); 3321 trlist = treasurelist::find (shstr_dragon_ability_fire);
3459 else if (atnr == ATNR_COLD) 3322 else if (atnr == ATNR_COLD)
3460 trlist = find_treasurelist ("dragon_ability_cold"); 3323 trlist = treasurelist::find (shstr_dragon_ability_cold);
3461 else if (atnr == ATNR_ELECTRICITY) 3324 else if (atnr == ATNR_ELECTRICITY)
3462 trlist = find_treasurelist ("dragon_ability_elec"); 3325 trlist = treasurelist::find (shstr_dragon_ability_elec);
3463 else if (atnr == ATNR_POISON) 3326 else if (atnr == ATNR_POISON)
3464 trlist = find_treasurelist ("dragon_ability_poison"); 3327 trlist = treasurelist::find (shstr_dragon_ability_poison);
3465 3328
3466 if (trlist == NULL || who->type != PLAYER) 3329 if (trlist == NULL || who->type != PLAYER)
3467 return; 3330 return;
3468 3331
3469 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3332 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3470 3333
3471 if (tr == NULL || tr->item == NULL) 3334 if (!tr || !tr->item)
3472 { 3335 {
3473 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3336 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3474 return; 3337 return;
3475 } 3338 }
3476 3339
3477 /* everything seems okay - now bring on the gift: */ 3340 /* everything seems okay - now bring on the gift: */
3478 item = &(tr->item->clone); 3341 item = tr->item;
3479 3342
3480 if (item->type == SPELL) 3343 if (item->type == SPELL)
3481 { 3344 {
3482 if (check_spell_known (who, item->name)) 3345 if (check_spell_known (who, item->name))
3483 return; 3346 return;
… …
3542 { 3405 {
3543 /* forces in the treasurelist can alter the player's stats */ 3406 /* forces in the treasurelist can alter the player's stats */
3544 object *skin; 3407 object *skin;
3545 3408
3546 /* first get the dragon skin force */ 3409 /* first get the dragon skin force */
3547 shstr_cmp dragon_skin_force ("dragon_skin_force");
3548 for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below) 3410 for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3549 ; 3411 ;
3550 3412
3551 if (!skin) 3413 if (!skin)
3552 return; 3414 return;
3553 3415
… …
3588 else 3450 else
3589 { 3451 {
3590 /* generate misc. treasure */ 3452 /* generate misc. treasure */
3591 tmp = arch_to_object (tr->item); 3453 tmp = arch_to_object (tr->item);
3592 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp)); 3454 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3593 tmp = insert_ob_in_ob (tmp, who); 3455 who->insert (tmp);
3594 if (who->type == PLAYER)
3595 esrv_send_item (who, tmp);
3596 } 3456 }
3597} 3457}
3598 3458
3599/** 3459/**
3600 * Unready an object for a player. This function does nothing if the object was 3460 * Unready an object for a player. This function does nothing if the object was
3601 * not readied. 3461 * not readied.
3602 */ 3462 */
3603void 3463void
3604player_unready_range_ob (player *pl, object *ob) 3464player_unready_range_ob (player *pl, object *ob)
3605{ 3465{
3606 rangetype i; 3466 if (pl->ob->current_weapon == ob)
3467 pl->ob->current_weapon = 0;
3607 3468
3608 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3469 if (pl->combat_ob == ob)
3609 { 3470 pl->combat_ob = 0;
3471
3610 if (pl->ranges[i] == ob) 3472 if (pl->ranged_ob == ob)
3611 { 3473 pl->ranged_ob = 0;
3612 pl->ranges[i] = NULL;
3613 if (pl->shoottype == i)
3614 {
3615 pl->shoottype = range_none;
3616 }
3617 }
3618 }
3619} 3474}
3475
3476sint8
3477player::visibility_at (maptile *map, int x, int y) const
3478{
3479 if (!ns)
3480 return 0;
3481
3482 int dx, dy;
3483 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3484 return 0;
3485
3486 x += dx - ns->current_x + ns->mapx / 2;
3487 y += dy - ns->current_y + ns->mapy / 2;
3488
3489 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3490 return 0;
3491
3492 return 100 - blocked_los [x][y];
3493}
3494
3495void
3496player::infobox (const char *title, const char *msg, int color)
3497{
3498 send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
3499}
3500
3501void
3502player::statusmsg (const char *msg, int color)
3503{
3504 send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
3505}
3506
3507void
3508player::failmsg (const char *msg, int color)
3509{
3510 play_sound (sound_find ("generic_failure"));
3511 statusmsg (msg, color);
3512}
3513

Diff Legend

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