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.60 by root, Sat Dec 23 09:41:55 2006 UTC vs.
Revision 1.187 by root, Mon Apr 21 07:07:36 2008 UTC

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

Diff Legend

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