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