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