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.91 by root, Sun Jan 7 23:10:43 2007 UTC vs.
Revision 1.206 by root, Mon Sep 29 10:20:49 2008 UTC

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

Diff Legend

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