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.82 by elmex, Wed Jan 3 02:30:52 2007 UTC vs.
Revision 1.182 by root, Thu Apr 17 14:06:03 2008 UTC

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

Diff Legend

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