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.93 by root, Mon Jan 8 14:11:05 2007 UTC vs.
Revision 1.198 by root, Sat May 17 00:17:02 2008 UTC

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

Diff Legend

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