ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/player.C
(Generate patch)

Comparing deliantra/server/server/player.C (file contents):
Revision 1.91 by root, Sun Jan 7 23:10:43 2007 UTC vs.
Revision 1.201 by root, Sun Aug 17 01:26:35 2008 UTC

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

Diff Legend

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