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.96 by root, Mon Jan 8 19:25:53 2007 UTC vs.
Revision 1.205 by root, Thu Sep 25 04:09:57 2008 UTC

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

Diff Legend

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